From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 4 Sep 2012 20:03:50 +0000 (+0200)
Subject: Merge branch 'dev_edge_optim'
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=08ae38f48bf9e7b0019d07227c705872cc8e6b57

Merge branch 'dev_edge_optim'
---

08ae38f48bf9e7b0019d07227c705872cc8e6b57