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

Conflicts:
	submodules/linphone
This commit is contained in:
Yann Diorcet 2013-02-25 15:02:02 +01:00
commit 3b2a227390

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