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

daemon/src/account.h

daemon/src/audio/audiorecord.cpp

daemon/src/config/serializable.h

daemon/src/config/yamlnode.cpp

daemon/src/config/yamlnode.h

daemon/src/iax/iaxaccount.cpp

daemon/src/iax/iaxaccount.h

daemon/src/iax/iaxvoiplink.cpp

daemon/src/iax/iaxvoiplink.h

daemon/src/im/instant_messaging.cpp

daemon/src/im/instant_messaging.h

daemon/src/managerimpl.cpp

daemon/src/managerimpl.h

daemon/src/preferences.cpp

daemon/src/preferences.h

daemon/src/sip/sipaccount.cpp

daemon/src/sip/sipaccount.h

daemon/src/sip/sipvoiplink.cpp

daemon/src/sip/sipvoiplink.h

daemon/src/voiplink.h