From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 25 May 2010 16:08:35 +0000 (+0200)
Subject: Merge branch 'master' of belledonne-communications.com:linphone-private
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=bc153b8007dd0a823bc82f20d5f94f44c810f145

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

bc153b8007dd0a823bc82f20d5f94f44c810f145