From: Simon Morlat Date: Wed, 19 Oct 2011 09:05:38 +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=a2e512ba0067191f3d9c9b300e5a491a6dcb7c8c Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone --- a2e512ba0067191f3d9c9b300e5a491a6dcb7c8c