-
Tristan Matthews authored
* Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into upgrade_to_ccrtp2 Resolved Conflicts: daemon/src/audio/audiortp/audio_rtp_session.cpp daemon/src/audio/audiortp/audio_symmetric_rtp_session.h daemon/src/audio/audiortp/audio_zrtp_session.cpp daemon/src/sip/siptransport.cpp
0c4e7645