]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone-private
authorJehan Monnier <jehan.monnier@linphone.org>
Fri, 25 Jun 2010 09:23:15 +0000 (11:23 +0200)
committerJehan Monnier <jehan.monnier@linphone.org>
Fri, 25 Jun 2010 09:23:15 +0000 (11:23 +0200)

Trivial merge