From: Simon Morlat Date: Thu, 16 Jun 2011 12:55:07 +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=4ec52ea7f7575ca15a94a56199a52ca384d7a8ba Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone --- 4ec52ea7f7575ca15a94a56199a52ca384d7a8ba