Merge branch 'master' of git+ssh://zobel@db.debian.org/git/dsa-wiki
authorMartin Zobel-Helas <zobel@debian.org>
Sun, 7 Jun 2009 13:31:24 +0000 (15:31 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Sun, 7 Jun 2009 13:31:24 +0000 (15:31 +0200)

Trivial merge