From: Simon Morlat <simon.morlat@linphone.org>
Date: Sat, 25 Sep 2010 14:38:51 +0000 (+0200)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=456773d9dc4287a1e36159ba1b81c3bb5d943b12

Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

Conflicts:
	coreapi/linphonecore.h
---

456773d9dc4287a1e36159ba1b81c3bb5d943b12