From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 7 Sep 2012 07:08:49 +0000 (+0200)
Subject: Merge branch 'edge'
X-Git-Url: http://sjero.net/git/?a=commitdiff_plain;h=febe300c386fe67c3443459b80684848a8eb550f;p=linphone

Merge branch 'edge'
---

febe300c386fe67c3443459b80684848a8eb550f