]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone
authorSylvain Berfini <Sylvain.Berfini@belledonne-communications.com>
Thu, 22 Dec 2011 13:07:17 +0000 (14:07 +0100)
committerSylvain Berfini <Sylvain.Berfini@belledonne-communications.com>
Thu, 22 Dec 2011 13:07:17 +0000 (14:07 +0100)

Trivial merge