Merge branch 'master' into bellesip

Conflicts:
	submodules/linphone
This commit is contained in:
Yann Diorcet 2013-02-22 16:50:02 +01:00
commit 1ab3c5ac8e

@ -1 +1 @@
Subproject commit 6791abd00d0fbb07eeb8aa1cbbba346777c81337
Subproject commit b5db1828fa4594cad1f3563606f25c738606057e