Guillaume Beraudo 5127119c46 Merge branch 'dev_conference' of git.linphone.org:linphone-private ... Conflicts: mediastreamer2		2011-09-20 14:49:49 +02:00
..
org	Merge branch 'dev_conference' of git.linphone.org:linphone-private	2011-09-20 14:49:49 +02:00