]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorSimon Morlat <simon.morlat@linphone.org>
Fri, 15 Apr 2011 21:55:27 +0000 (23:55 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Fri, 15 Apr 2011 21:55:27 +0000 (23:55 +0200)

Trivial merge