Merge branch 'master' of git.linphone.org:linphone-android

Conflicts:
	submodules/linphone
This commit is contained in:
Simon Morlat 2011-09-22 12:06:40 +02:00
commit 6366fac197

@ -1 +1 @@
Subproject commit 776d58673a12ceb309ad0e0dc50857b82e3a5d87
Subproject commit 73acd25082b213ba0ce6cd77cecd736b34b4bdc2