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

sflphone-client-gnome/src/config/addressbook-config.c

sflphone-client-gnome/src/contacts/searchbar.c

sflphone-client-gnome/src/uimanager.c

sflphone-common/src/audio/alsa/alsalayer.cpp

sflphone-common/src/audio/audiodevice.cpp

sflphone-common/src/audio/audiolayer.h

sflphone-common/src/audio/audiorecord.cpp

sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.cpp

sflphone-common/src/audio/audiortp/AudioRtpSession.cpp

sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp

sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp

sflphone-common/src/audio/audiortp/ZrtpSessionCallback.cpp

sflphone-common/src/audio/codecs/alaw.cpp

sflphone-common/src/audio/codecs/audiocodec.h

sflphone-common/src/audio/codecs/g722.cpp

sflphone-common/src/audio/codecs/speexcodec_nb.cpp

sflphone-common/src/audio/codecs/speexcodec_ub.cpp

sflphone-common/src/audio/codecs/speexcodec_wb.cpp

sflphone-common/src/audio/codecs/ulaw.cpp

sflphone-common/src/audio/delaydetection.cpp