]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone-private
authorGuillaume Beraudo <guillaume.beraudo@linphone.org>
Mon, 13 Dec 2010 15:49:00 +0000 (16:49 +0100)
committerGuillaume Beraudo <guillaume.beraudo@linphone.org>
Mon, 13 Dec 2010 15:49:00 +0000 (16:49 +0100)

Trivial merge