Guillaume Beraudo f515a560bc Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone ... Conflicts: mediastreamer2		2011-02-23 16:13:08 +01:00
..
org	Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone	2011-02-23 16:13:08 +01:00