Merge branch 'master' into bellesip

Conflicts:
	submodules/linphone
This commit is contained in:
Yann Diorcet 2013-02-28 10:48:01 +01:00
commit e6f7074a2c

@ -1 +1 @@
Subproject commit 82a7a9f7f596488d1df6e18489eea15818e9fa51 Subproject commit 644008c6295236c9bb2dd2a1e443f616afca7967