From: Margaux Clerc Date: Wed, 20 Mar 2013 11:37:38 +0000 (+0100) Subject: Merge branch 'master' of git.linphone.org:linphone X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=c91cc8563316ad0cedebdb6d9464c4a010af3f29 Merge branch 'master' of git.linphone.org:linphone --- c91cc8563316ad0cedebdb6d9464c4a010af3f29