Merge branch 'master' of...

sflphone-client-gnome/src/widget/webwidget.c

sflphone-client-gnome/src/widget/webwidget.h

sflphone-common/src/MimeParameters.h

sflphone-common/src/account.cpp

sflphone-common/src/account.h

sflphone-common/src/audio/audiorecord.cpp

sflphone-common/src/audio/audiorecord.h

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

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

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

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

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

sflphone-common/src/audio/echocancel.cpp

sflphone-common/src/audio/echocancel.h

sflphone-common/src/audio/mainbuffer.cpp

sflphone-common/src/audio/ringbuffer.cpp

sflphone-common/src/audio/ringbuffer.h

sflphone-common/src/dbus/callmanager.h

sflphone-common/src/dbus/networkmanager.cpp

sflphone-common/src/dbus/networkmanager.h