Merge branch 'master' of...

sflphone-client-gnome/pixmaps/Makefile.am

sflphone-client-gnome/pixmaps/sflphone_offline.svg

sflphone-client-gnome/src/actions.c

sflphone-client-gnome/src/sflphone_const.h

sflphone-client-gnome/src/statusicon.c

sflphone-common/configure.ac

sflphone-common/globals.mak

sflphone-common/src/Makefile.am

sflphone-common/src/account.cpp

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

sflphone-common/src/audio/audiolayer.cpp

sflphone-common/src/audio/audiortp.cpp

sflphone-common/src/audio/audiortp/AudioRtpFactory.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/celtcodec.cpp

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

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

sflphone-common/src/audio/mainbuffer.cpp