-
Tristan Matthews authored
Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into video_preview Resolved Conflicts: daemon/src/dbus/callmanager.cpp daemon/src/main.cpp gnome/src/dbus/dbus.c gnome/src/dbus/dbus.h
5263e1d0