2 commits

Author	SHA1	Message	Date
Pierre-Eric Pelloux-Prayer	b28cc704cd	Correct typo in tunnel settings, update exosip	2012-02-07 10:10:01 +01:00
Pierre-Eric Pelloux-Prayer	17cc55d854	Merge remote-tracking branch 'public/master' into tunnel ... Conflicts: Classes/LinphoneUI/LinphoneManager.h Settings.bundle/Root.plist linphone.xcodeproj/project.pbxproj nogpl-thirdparties/Settings.bundle/Root.plist submodules/build/builder-iphone-os.mk submodules/linphone	2012-02-06 13:22:39 +01:00