]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorJehan Monnier <jehan.monnier@linphone.org>
Fri, 24 Sep 2010 11:03:31 +0000 (13:03 +0200)
committerJehan Monnier <jehan.monnier@linphone.org>
Fri, 24 Sep 2010 11:03:31 +0000 (13:03 +0200)

Trivial merge