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

daemon/src/sip/sipvoiplink.cpp

gnome/configure.ac

gnome/src/actions.c

gnome/src/actions.h

gnome/src/callable_obj.c

gnome/src/callable_obj.h

gnome/src/conference_obj.c

gnome/src/contacts/addrbookfactory.c

gnome/src/contacts/calllist.c

gnome/src/contacts/calllist.h

gnome/src/contacts/calltab.c

gnome/src/contacts/calltab.h

gnome/src/contacts/calltree.c

gnome/src/contacts/calltree.h

gnome/src/contacts/history.c

gnome/src/contacts/history.h

gnome/src/contacts/searchbar.c

gnome/src/contacts/searchbar.h

gnome/src/dbus/dbus.c

gnome/src/imwindow.c