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

daemon/src/main.cpp

gnome/.cproject

gnome/src/actions.c

gnome/src/actions.h

gnome/src/callable_obj.c

gnome/src/config/accountconfigdialog.c

gnome/src/config/addressbook-config.c

gnome/src/config/addressbook-config.h

gnome/src/config/preferencesdialog.c

gnome/src/contacts/addrbookfactory.c

gnome/src/contacts/addrbookfactory.h

gnome/src/contacts/addressbook.h

gnome/src/contacts/calllist.c

gnome/src/contacts/calltree.c

gnome/src/contacts/searchbar.c

gnome/src/dbus/dbus.c

gnome/src/dialpad.c

gnome/src/mainwindow.c

gnome/src/mainwindow.h

gnome/src/sflnotify.c