linphone-android/src/org
Sylvain Berfini 64732160e5 Merge remote-tracking branch 'origin/master' into newUI
Conflicts:
	submodules/linphone
2012-07-19 17:36:10 +02:00
..
linphone Merge remote-tracking branch 'origin/master' into newUI 2012-07-19 17:36:10 +02:00