]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone-private
authorJehan Monnier <jehan.monnier@linphone.org>
Fri, 14 May 2010 14:50:23 +0000 (16:50 +0200)
committerJehan Monnier <jehan.monnier@linphone.org>
Fri, 14 May 2010 14:50:23 +0000 (16:50 +0200)

Trivial merge