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

daemon/src/account.cpp

daemon/src/account.h

daemon/src/audio/codecs/audiocodecfactory.cpp

daemon/src/dbus/configurationmanager-introspec.xml

daemon/src/dbus/configurationmanager.cpp

daemon/src/dbus/configurationmanager.h

daemon/src/fileutils.cpp

daemon/src/fileutils.h

daemon/src/iax/iaxaccount.cpp

daemon/src/iax/iaxaccount.h

daemon/src/main.cpp

daemon/src/managerimpl.h

daemon/src/managerimpl_registration.cpp

daemon/src/sip/sipaccount.cpp

daemon/src/sip/sipaccount.h

daemon/src/sip/sipvoiplink.cpp

daemon/test/configurationtest.cpp

gnome/src/config/accountlistconfigdialog.c

gnome/src/contacts/calltree.c

gnome/src/dbus/configurationmanager-introspec.xml