Merge branch 'master' of...

NEWS

sflphone-client-gnome/VERSION

sflphone-client-gnome/configure.ac

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

sflphone-client-gnome/src/config/shortcuts-config.c

sflphone-client-gnome/src/shortcuts.c

sflphone-client-gnome/src/shortcuts.h

sflphone-client-kde/CMakeLists.txt

sflphone-client-kde/src/conf/ConfigurationSkeleton.cpp

sflphone-client-kde/src/conf/dlgaccounts.cpp

sflphone-client-kde/src/conf/dlgaccounts.h

sflphone-client-kde/src/conf/dlgaccountsbase.ui

sflphone-client-kde/src/sflphone_const.h

sflphone-common/Makefile.am

sflphone-common/VERSION

sflphone-common/configure.ac

sflphone-common/doc/Makefile.am

sflphone-common/doc/dbus-api/Makefile.am

sflphone-common/doc/dbus-api/README

sflphone-common/doc/dbus-api/doc/templates/devhelp.devhelp2