Merge branch 'master' into common-lang

sflphone-client-gnome/VERSION

sflphone-common/VERSION

sflphone-common/configure.ac

sflphone-common/src/config/config.cpp

sflphone-common/src/config/config.h

sflphone-common/src/global.h

sflphone-common/src/managerimpl.cpp

sflphone-common/src/sdp.cpp

sflphone-common/src/sdp.h

sflphone-common/src/sipvoiplink.cpp

...stributions/ubuntu/debian-sflphone-client-gnome/changelog

...distributions/ubuntu/debian-sflphone-client-kde/changelog

...tem/distributions/ubuntu/debian-sflphone-common/changelog