From: Simon Morlat Date: Thu, 12 Jan 2012 16:16:46 +0000 (+0100) Subject: Merge branch 'master' of git.linphone.org:linphone X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=d58f20004ccd4b21ea10c4e11aa1c9978e8ff96a Merge branch 'master' of git.linphone.org:linphone --- d58f20004ccd4b21ea10c4e11aa1c9978e8ff96a