Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki
authorMartin Zobel-Helas <zobel@debian.org>
Tue, 24 Aug 2010 07:55:22 +0000 (09:55 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Tue, 24 Aug 2010 07:55:22 +0000 (09:55 +0200)

Trivial merge