]> git.deb.at Git - deb/packages.git/commitdiff
Merge branch 'master' into debian-master
authorSimon Paillard <spaillard@debian.org>
Fri, 29 Apr 2011 22:12:58 +0000 (00:12 +0200)
committerSimon Paillard <spaillard@debian.org>
Fri, 29 Apr 2011 22:12:58 +0000 (00:12 +0200)

Trivial merge