]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
authorGuillaume Beraudo <guillaume.beraudo@linphone.org>
Mon, 11 Apr 2011 10:17:05 +0000 (12:17 +0200)
committerGuillaume Beraudo <guillaume.beraudo@linphone.org>
Mon, 11 Apr 2011 10:17:05 +0000 (12:17 +0200)

Trivial merge