Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki
authorMartin Zobel-Helas <zobel@debian.org>
Thu, 20 May 2010 13:49:22 +0000 (15:49 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Thu, 20 May 2010 13:49:22 +0000 (15:49 +0200)

Trivial merge