From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 22 Feb 2013 20:37:11 +0000 (+0100)
Subject: Merge branch 'master' of git.linphone.org:linphone
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=468a1b69d4871a598a4d55dbed4fa8909ccc3d08

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

Conflicts:
	mediastreamer2
---

468a1b69d4871a598a4d55dbed4fa8909ccc3d08