Merge branch 'master' into video_preview

sflphone-client-gnome/src/actions.c

sflphone-client-gnome/src/uimanager.c

sflphone-common/src/Codec.h

sflphone-common/src/MimeParameters.h

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

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

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

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

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

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

sflphone-common/src/audio/codecs/gsmcodec.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