Merge branch 'master' of belledonne-communications.com:linphone-iphone

Conflicts:
	submodules/linphone
This commit is contained in:
Jehan Monnier 2011-02-03 16:50:15 +01:00
commit 890e65f189

Diff content is not available