Merge branch 'master' of...

.gitmodules

daemon/src/account.cpp

daemon/src/account.h

daemon/src/account_schema.h

daemon/src/audio/audiortp/audio_rtp_record_handler.cpp

daemon/src/audio/audiortp/audio_rtp_record_handler.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/global.h

daemon/src/managerimpl.cpp

daemon/src/sip/sdp.cpp

daemon/src/sip/sdp.h

daemon/src/sip/sip_utils.cpp

daemon/src/sip/sip_utils.h

daemon/src/sip/sipaccount.cpp

daemon/src/sip/sipaccount.h

daemon/src/sip/sipvoiplink.cpp

daemon/src/video/libav_utils.cpp