Merge branch 'master' into jbonjean

sflphone-client-gnome/src/codeclist.c

sflphone-client-gnome/src/uimanager.c

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/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

sflphone-common/doc/dbus-api/doc/templates/errors.html

sflphone-common/doc/dbus-api/doc/templates/fullindex.html

...hone-common/doc/dbus-api/doc/templates/generic-types.html

sflphone-common/doc/dbus-api/doc/templates/index.html

sflphone-common/doc/dbus-api/doc/templates/interface.html

sflphone-common/doc/dbus-api/doc/templates/interfaces.html