]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
authorJehan Monnier <jehan.monnier@linphone.org>
Tue, 18 Jan 2011 11:36:24 +0000 (12:36 +0100)
committerJehan Monnier <jehan.monnier@linphone.org>
Tue, 18 Jan 2011 11:36:24 +0000 (12:36 +0100)

Trivial merge