]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone
authorYann Diorcet <yann.diorcet@belledonne-communications.com>
Thu, 31 May 2012 11:01:55 +0000 (13:01 +0200)
committerYann Diorcet <yann.diorcet@belledonne-communications.com>
Thu, 31 May 2012 11:01:55 +0000 (13:01 +0200)

Trivial merge