From: Guillaume Beraudo Date: Wed, 30 Mar 2011 07:32:15 +0000 (+0200) Subject: Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=7f27de59c7f6773c54aec61e0bebc5bdd12c6f83 Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone --- 7f27de59c7f6773c54aec61e0bebc5bdd12c6f83