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:11:58 +01:00
commit a353c78d37

@ -1 +1 @@
Subproject commit e6157a4cf1c92764b9d1aa6246e6987b604f1a85
Subproject commit 82a7a9f7f596488d1df6e18489eea15818e9fa51