]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone
authorJehan Monnier <jehan.monnier@linphone.org>
Mon, 14 Nov 2011 10:53:02 +0000 (11:53 +0100)
committerJehan Monnier <jehan.monnier@linphone.org>
Mon, 14 Nov 2011 10:53:02 +0000 (11:53 +0100)

Trivial merge