]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone
authorSylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Tue, 20 Dec 2011 14:06:58 +0000 (15:06 +0100)
committerSylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Tue, 20 Dec 2011 14:06:58 +0000 (15:06 +0100)

Trivial merge