]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone
authorYann Diorcet <yann.diorcet@belledonne-communications.com>
Mon, 6 Aug 2012 08:41:17 +0000 (10:41 +0200)
committerYann Diorcet <yann.diorcet@belledonne-communications.com>
Mon, 6 Aug 2012 08:41:17 +0000 (10:41 +0200)

Trivial merge