Simon Morlat 6d0b58eb71 Merge branch 'dev_conference' ... Conflicts: coreapi/linphonecall.c coreapi/linphonecore.c java/common/org/linphone/core/LinphoneCall.java mediastreamer2		2011-09-16 21:51:26 +02:00
..
org	Merge branch 'dev_conference'	2011-09-16 21:51:26 +02:00