Simon Morlat 263b103154 Merge remote-tracking branch 'private/srtp' ... Conflicts: coreapi/linphonecore.c coreapi/linphonecore.h coreapi/sal_eXosip2.c java/common/org/linphone/core/LinphoneCore.java oRTP		2011-11-04 10:32:08 +01:00
..
org	Merge remote-tracking branch 'private/srtp'	2011-11-04 10:32:08 +01:00