Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

daemon/src/account.cpp

daemon/src/audio/codecs/audiocodecfactory.cpp

daemon/src/audio/codecs/audiocodecfactory.h

daemon/src/dbus/configurationmanager-introspec.xml

daemon/src/dbus/configurationmanager.cpp

daemon/src/dbus/configurationmanager.h

daemon/src/global.h

daemon/src/iax/iaxcall.cpp

daemon/src/iax/iaxcall.h

daemon/src/iax/iaxvoiplink.cpp

daemon/src/managerimpl.cpp

daemon/src/managerimpl.h

daemon/src/sip/sdp.cpp

daemon/src/sip/sipvoiplink.cpp

gnome/src/actions.c

gnome/src/codeclist.c

gnome/src/dbus/configurationmanager-introspec.xml

gnome/src/dbus/dbus.c

gnome/src/dbus/dbus.h