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

sflphone-client-gnome/src/Makefile.am

sflphone-client-gnome/src/accountlist.c

sflphone-client-gnome/src/actions.c

sflphone-client-gnome/src/callable_obj.c

sflphone-client-gnome/src/callable_obj.h

sflphone-client-gnome/src/conference_obj.c

sflphone-client-gnome/src/conference_obj.h

sflphone-client-gnome/src/contacts/calllist.c

sflphone-client-gnome/src/contacts/calllist.h

sflphone-client-gnome/src/contacts/calltree.c

sflphone-client-gnome/src/contacts/conferencelist.c

sflphone-client-gnome/src/contacts/conferencelist.h

sflphone-client-gnome/src/dbus/dbus.c

sflphone-client-gnome/src/imwindow.c

sflphone-client-gnome/src/mainwindow.c

sflphone-client-gnome/src/uimanager.c

sflphone-client-gnome/src/widget/imwidget.c

sflphone-common/src/audio/audiortp/ZrtpSessionCallback.h

sflphone-common/src/managerimpl.cpp