]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone
authorYann Diorcet <yann.diorcet@belledonne-communications.com>
Tue, 11 Dec 2012 09:40:05 +0000 (10:40 +0100)
committerYann Diorcet <yann.diorcet@belledonne-communications.com>
Tue, 11 Dec 2012 09:40:05 +0000 (10:40 +0100)

Trivial merge