Guillaume Beraudo 36493970e5 Merge commit '2e953b4' ... Conflicts: coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java coreapi/linphonecore_jni.cc		2010-12-13 15:08:31 +01:00
..
org	Merge commit '2e953b4'	2010-12-13 15:08:31 +01:00