]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone-private
authorJehan Monnier <jehan.monnier@linphone.org>
Tue, 30 Nov 2010 15:05:58 +0000 (16:05 +0100)
committerJehan Monnier <jehan.monnier@linphone.org>
Tue, 30 Nov 2010 15:05:58 +0000 (16:05 +0100)

Trivial merge