Merge branch 'master' of...

sflphone-client-gnome/doc/C/figures/accounts_security.png

sflphone-client-gnome/doc/C/figures/srtp_enabled.png

sflphone-client-gnome/doc/C/figures/zrtp_options.png

sflphone-client-gnome/doc/C/sflphone.xml

sflphone-client-gnome/doc/Makefile.am

sflphone-client-gnome/po/Makefile.am

sflphone-common/configure.ac

tools/build-system/build-osc.sh

tools/build-system/launch-build-machine-2.sh

...d-system/launchpad/sflphone-client-gnome/debian/changelog

...s/build-system/launchpad/sflphone-common/debian/changelog

tools/build-system/osc/sflphone-client-gnome.spec

...d-system/osc/sflphone-common-dbus-service-in-libdir.patch

tools/build-system/osc/sflphone-common.spec