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

Conflicts:
	submodules/linphone
This commit is contained in:
Yann Diorcet 2013-02-25 11:56:27 +01:00
commit 7e590522ba

@ -1 +1 @@
Subproject commit 1d3ba8e0b67d654b872e51db2cb5e00b8577b057
Subproject commit 2162290491e07c49d46034a40e1b4e60978d6c26