Jehan Monnier 0bc5c52e23 Merge branch 'master' into tunnel ... Conflicts: Classes/LinphoneUI/LinphoneManager.h Classes/LinphoneUI/LinphoneManager.m linphone.xcodeproj/project.pbxproj		2011-05-30 17:33:02 +02:00
..
project.pbxproj	Merge branch 'master' into tunnel	2011-05-30 17:33:02 +02:00