]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone-private
authorJehan Monnier <jehan.monnier@linphone.org>
Fri, 30 Apr 2010 16:02:05 +0000 (18:02 +0200)
committerJehan Monnier <jehan.monnier@linphone.org>
Fri, 30 Apr 2010 16:02:05 +0000 (18:02 +0200)

Trivial merge