]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone
authorSylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Thu, 28 Jun 2012 12:38:29 +0000 (14:38 +0200)
committerSylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Thu, 28 Jun 2012 12:38:29 +0000 (14:38 +0200)

Trivial merge