From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 14 Nov 2012 13:03:38 +0000 (+0100)
Subject: Merge branch 'master' of git.linphone.org:linphone
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=0268f1471374acab83f3aec0dacfa62f46ef1271

Merge branch 'master' of git.linphone.org:linphone

Conflicts:
	mediastreamer2
---

0268f1471374acab83f3aec0dacfa62f46ef1271