Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

daemon/src/config/config.cpp

daemon/src/config/config.h

daemon/src/dbus/configurationmanager-introspec.xml

daemon/src/dbus/configurationmanager.cpp

daemon/src/dbus/configurationmanager.h

daemon/src/history/historyitem.cpp

daemon/src/history/historyitem.h

daemon/src/history/historymanager.cpp

daemon/src/history/historymanager.h

daemon/src/managerimpl.cpp

daemon/src/managerimpl.h

daemon/test/history-sample.tpl

daemon/test/historytest.cpp

daemon/test/historytest.h

gnome/src/actions.c

gnome/src/callable_obj.c

gnome/src/callable_obj.h

gnome/src/config/preferencesdialog.c

gnome/src/contacts/calllist.c

gnome/src/contacts/calllist.h