Merge branch 'master' of ssh://manu@192.168.50.105//home/manu/dev/tmp/sflphone into url_hook

sflphone-gtk/src/Makefile.am

sflphone-gtk/src/configurationmanager-glue.h

sflphone-gtk/src/configwindow.c

sflphone-gtk/src/dbus.c

sflphone-gtk/src/dbus.h

sflphone-gtk/src/hooks-config.c

sflphone-gtk/src/hooks-config.h

src/dbus/configurationmanager-glue.h

src/dbus/configurationmanager-introspec.xml

src/dbus/configurationmanager.cpp

src/dbus/configurationmanager.h

src/global.h

src/managerimpl.cpp

src/managerimpl.h

src/user_cfg.h