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

daemon/configure.ac

daemon/src/Makefile.am

daemon/src/audio/Makefile.am

daemon/src/audio/alsa/alsalayer.cpp

daemon/src/audio/audiolayer.h

daemon/src/audio/audioloop.cpp

daemon/src/audio/audioloop.h

daemon/src/audio/audiorecord.cpp

daemon/src/audio/audiorecord.h

daemon/src/audio/audiortp/audio_rtp_record_handler.cpp

daemon/src/audio/audiortp/audio_rtp_session.cpp

daemon/src/audio/audiortp/audio_srtp_session.cpp

daemon/src/audio/audiortp/audio_symmetric_rtp_session.cpp

daemon/src/audio/audiortp/audio_zrtp_session.cpp

daemon/src/audio/audiortp/zrtp_session_callback.cpp

daemon/src/audio/codecs/alaw.cpp

daemon/src/audio/codecs/audiocodecfactory.cpp

daemon/src/audio/codecs/g722.cpp

daemon/src/audio/codecs/ulaw.cpp

daemon/src/audio/dcblocker.h