]> git.deb.at Git - deb/packages.git/commitdiff
Merge branch 'master' into debian-master
authorSimon Paillard <simon.paillard@resel.enst-bretagne.fr>
Mon, 10 Jan 2011 23:28:57 +0000 (00:28 +0100)
committerSimon Paillard <simon.paillard@resel.enst-bretagne.fr>
Mon, 10 Jan 2011 23:28:57 +0000 (00:28 +0100)

Trivial merge