]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone
authorYann Diorcet <yann.diorcet@belledonne-communications.com>
Wed, 16 Jan 2013 14:35:15 +0000 (15:35 +0100)
committerYann Diorcet <yann.diorcet@belledonne-communications.com>
Wed, 16 Jan 2013 14:35:15 +0000 (15:35 +0100)

Trivial merge