From: Simon Morlat Date: Tue, 15 Feb 2011 20:36:42 +0000 (+0100) 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=906262c0500e0cbc421ae8436ad3687b83fa088e Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone --- 906262c0500e0cbc421ae8436ad3687b83fa088e