Merge branch 'master' of...

Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into hold_secured_call Resolved Conflicts: daemon/src/audio/audiortp/audio_rtp_factory.cpp

Merge branch 'master' of...
b5e0f19c · Tristan Matthews · 74e95e8e · b5e0f19c · b5e0f19c · b5e0f19c
Commit b5e0f19c authored 13 years ago by Tristan Matthews
--- a/src/Item.h
+++ b/src/Item.h
--- a/src/instance_interface_singleton.h
+++ b/src/instance_interface_singleton.h
--- a/src/sflphone_const.h
+++ b/src/sflphone_const.h