Guillaume Beraudo 600102e268 Merge branch 'master' of git.linphone.org:linphone-android ... Conflicts: submodules/linphone		2011-06-01 11:39:07 +02:00
..
linphone	Merge branch 'master' of git.linphone.org:linphone-android	2011-06-01 11:39:07 +02:00
mediastreamer2/test	Move ring test from mediastreamer2.	2011-04-07 10:54:57 +02:00