]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git://git.savannah.nongnu.org/linphone
authorGuillaume Beraudo <guillaume.beraudo@linphone.org>
Fri, 1 Apr 2011 14:12:33 +0000 (16:12 +0200)
committerGuillaume Beraudo <guillaume.beraudo@linphone.org>
Fri, 1 Apr 2011 14:12:33 +0000 (16:12 +0200)

Trivial merge