]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorJehan Monnier <jehan.monnier@linphone.org>
Wed, 29 Sep 2010 13:26:32 +0000 (15:26 +0200)
committerJehan Monnier <jehan.monnier@linphone.org>
Wed, 29 Sep 2010 13:26:32 +0000 (15:26 +0200)

Trivial merge