]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorSimon Morlat <simon.morlat@linphone.org>
Fri, 2 Sep 2011 20:32:46 +0000 (22:32 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Fri, 2 Sep 2011 20:32:46 +0000 (22:32 +0200)

Trivial merge