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

Trivial merge