]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone
authorSylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Fri, 28 Oct 2011 10:32:03 +0000 (12:32 +0200)
committerSylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Fri, 28 Oct 2011 10:32:03 +0000 (12:32 +0200)

Trivial merge