Conflicts:
	.gitignore
	daemon/src/audio/audiortp/AudioRtpFactory.cpp
	daemon/src/iax/iaxvoiplink.h
	daemon/src/managerimpl.h
	daemon/src/sip/sdp.cpp
	daemon/src/sip/sdp.h
	daemon/src/sip/sdpmedia.cpp
	daemon/src/sip/sdpmedia.h
	daemon/src/sip/sipcall.cpp
	daemon/src/sip/sipcall.h
	daemon/src/sip/sipvoiplink.cpp
	gnome/configure.ac
	gnome/src/Makefile.am
	gnome/src/config/Makefile.am
	gnome/tests/Makefile.am