Guillaume Beraudo d892fce8c0 Merge branch 'master' of git.linphone.org:linphone-private ... Conflicts: coreapi/linphonecore_jni.cc java/common/org/linphone/core/LinphoneCore.java		2010-11-26 15:01:08 +01:00
..
org	Merge branch 'master' of git.linphone.org:linphone-private	2010-11-26 15:01:08 +01:00