Jehan Monnier a9db49b15a Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone ... Conflicts: java/common/org/linphone/core/LinphoneCore.java		2010-11-25 14:00:06 +01:00
..
org	Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone	2010-11-25 14:00:06 +01:00