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

daemon/README

daemon/src/account.cpp

daemon/src/audio/audiortp/audio_rtp_stream.cpp

daemon/src/audio/audiortp/audio_rtp_stream.h

daemon/src/audio/opensl/opensllayer.cpp

daemon/src/audio/ringbuffer.h

daemon/src/client/callmanager.cpp

daemon/src/client/callmanager.h

daemon/src/client/dbus/callmanager-introspec.xml

daemon/src/client/dbus/video_controls-introspec.xml

daemon/src/client/dbus/video_controls.cpp

daemon/src/client/video_controls.h

daemon/src/conference.cpp

daemon/src/conference.h

daemon/src/ip_utils.cpp

daemon/src/ip_utils.h

daemon/src/managerimpl.cpp

daemon/src/managerimpl.h

daemon/src/sip/sdp.cpp

daemon/src/sip/sdp.h