Merge remote-tracking branch 'public/master' into tunnel

Conflicts:
	submodules/liblinphone.xcodeproj/project.pbxproj
This commit is contained in:
Jehan Monnier 2011-11-07 08:27:12 +01:00
commit abd33ca382

@ -1 +1 @@
Subproject commit dcd99591f21154775b3d07fc327caac6cc27b5de
Subproject commit f13744a765200961c74617c12295d04640a74f05