]> sjero.net Git - linphone/commitdiff
Merge branch 'master' into tunnel
authorJehan Monnier <jehan.monnier@linphone.org>
Thu, 22 Dec 2011 10:13:08 +0000 (11:13 +0100)
committerJehan Monnier <jehan.monnier@linphone.org>
Thu, 22 Dec 2011 10:13:08 +0000 (11:13 +0100)

Trivial merge