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

daemon/src/audio/alsa/alsalayer.cpp

daemon/src/audio/audiolayer.cpp

daemon/src/audio/mainbuffer.cpp

daemon/src/audio/mainbuffer.h

daemon/src/audio/pulseaudio/pulselayer.cpp

daemon/src/audio/ringbuffer.cpp

daemon/src/audio/ringbuffer.h

daemon/src/audio/sound/audiofile.cpp

daemon/src/audio/speexechocancel.cpp

daemon/src/audio/speexechocancel.h

daemon/src/call.cpp

daemon/src/conference.cpp

daemon/src/config/yamlemitter.cpp

daemon/src/config/yamlemitter.h

daemon/src/config/yamlnode.cpp

daemon/src/config/yamlnode.h

daemon/src/config/yamlparser.cpp

daemon/src/im/instant_messaging.h

daemon/src/managerimpl.cpp

daemon/src/preferences.cpp