]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone
authorMargaux Clerc <margaux.clerc@belledonne-communications.com>
Wed, 20 Mar 2013 11:37:38 +0000 (12:37 +0100)
committerMargaux Clerc <margaux.clerc@belledonne-communications.com>
Wed, 20 Mar 2013 11:37:38 +0000 (12:37 +0100)

Trivial merge