Merge branch 'master' into bellesip

Conflicts:
	submodules/linphone
This commit is contained in:
Yann Diorcet 2013-02-13 11:59:52 +01:00
commit 3f3e9d7820

@ -1 +1 @@
Subproject commit 63fa87209c21d65133d24551c7e92a7ac39059a3
Subproject commit f90176b636b00a6468de8771030a00918ac8cccc