From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 12 Mar 2010 17:50:50 +0000 (+0100)
Subject: Merge branch 'dev_sal' of belledonne-communications.com:linphone-private into dev_sal
X-Git-Url: http://sjero.net/git/?a=commitdiff_plain;h=8bd6cd48edd8e20317581607aa9c77b679e1a639;p=linphone

Merge branch 'dev_sal' of belledonne-communications.com:linphone-private into dev_sal
---

8bd6cd48edd8e20317581607aa9c77b679e1a639