]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone
authorYann Diorcet <yann.diorcet@belledonne-communications.com>
Thu, 29 Nov 2012 16:23:45 +0000 (17:23 +0100)
committerYann Diorcet <yann.diorcet@belledonne-communications.com>
Thu, 29 Nov 2012 16:23:45 +0000 (17:23 +0100)

Trivial merge