]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone
authorSylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Wed, 23 May 2012 15:37:09 +0000 (17:37 +0200)
committerSylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Wed, 23 May 2012 15:37:09 +0000 (17:37 +0200)

Trivial merge