]> git.deb.at Git - deb/packages.git/commitdiff
Merge branch 'master' into ubuntu-master
authorGerfried Fuchs <rhonda@debian.org>
Fri, 14 Oct 2011 10:58:04 +0000 (12:58 +0200)
committerGerfried Fuchs <rhonda@debian.org>
Fri, 14 Oct 2011 10:58:04 +0000 (12:58 +0200)

Trivial merge