]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorSimon Morlat <simon.morlat@linphone.org>
Fri, 10 Jun 2011 14:01:39 +0000 (16:01 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Fri, 10 Jun 2011 14:01:39 +0000 (16:01 +0200)

Trivial merge