]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone-private
authorJehan Monnier <jehan.monnier@linphone.org>
Fri, 10 Dec 2010 15:38:17 +0000 (16:38 +0100)
committerJehan Monnier <jehan.monnier@linphone.org>
Fri, 10 Dec 2010 15:38:17 +0000 (16:38 +0100)

Trivial merge