]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
authorJehan Monnier <jehan.monnier@linphone.org>
Fri, 22 Oct 2010 16:29:09 +0000 (18:29 +0200)
committerJehan Monnier <jehan.monnier@linphone.org>
Fri, 22 Oct 2010 16:29:09 +0000 (18:29 +0200)

Trivial merge