From: Simon Morlat Date: Tue, 30 Aug 2011 10:02:35 +0000 (+0200) Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=3033fe35e7599b8c5936ab8b52ce1bc98f8aba2f Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone --- 3033fe35e7599b8c5936ab8b52ce1bc98f8aba2f