Merge branch 'master' of...

sflphone-client-gnome/src/statusicon.c

sflphone-client-gnome/src/statusicon.h

sflphone-client-gnome/src/ui.xml

sflphone-client-gnome/src/uimanager.c

sflphone-client-kde/src/AccountWizard.cpp

sflphone-client-kde/src/SFLPhone.cpp

sflphone-client-kde/src/main.cpp

sflphone-common/src/audio/audiolayer.h

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

sflphone-common/src/audio/mainbuffer.cpp

sflphone-common/src/audio/pulseaudio/audiostream.cpp

sflphone-common/src/audio/pulseaudio/audiostream.h

sflphone-common/src/audio/pulseaudio/pulselayer.cpp

sflphone-common/src/audio/samplerateconverter.cpp

sflphone-common/src/dbus/callmanager.cpp

sflphone-common/src/dbus/configurationmanager-introspec.xml

sflphone-common/src/managerimpl.cpp

sflphone-common/src/sip/sdp.h

sflphone-common/src/sip/sipvoiplink.cpp

sflphone-common/src/user_cfg.h