]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/linphone
authorGuillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Fri, 6 May 2011 11:58:55 +0000 (13:58 +0200)
committerGuillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Fri, 6 May 2011 11:58:55 +0000 (13:58 +0200)

Trivial merge