]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone-private
authorJehan Monnier <jehan.monnier@linphone.org>
Sun, 11 Jul 2010 14:39:02 +0000 (16:39 +0200)
committerJehan Monnier <jehan.monnier@linphone.org>
Sun, 11 Jul 2010 14:39:02 +0000 (16:39 +0200)

Trivial merge