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

daemon/src/audio/alsa/alsalayer.cpp

daemon/src/audio/alsa/alsalayer.h

daemon/src/audio/dcblocker.cpp

daemon/src/audio/dcblocker.h

daemon/src/audio/pulseaudio/audiostream.cpp

daemon/src/audio/pulseaudio/audiostream.h

daemon/src/audio/pulseaudio/pulselayer.cpp

daemon/src/audio/pulseaudio/pulselayer.h

daemon/src/audio/samplerateconverter.cpp

daemon/src/managerimpl.cpp

daemon/test/audiolayertest.cpp

gnome/src/config/audioconf.c

gnome/src/mainwindow.c

gnome/src/uimanager.c

gnome/src/uimanager.h