]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone into tunnel
authorGuillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Wed, 18 Jan 2012 11:14:54 +0000 (12:14 +0100)
committerGuillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Wed, 18 Jan 2012 11:14:54 +0000 (12:14 +0100)

Trivial merge