Merge branch 'master' of git+ssh://db.debian.org/srv/db.debian.org/git/dsa-wiki
authorMartin Zobel-Helas <zobel@debian.org>
Sun, 20 Dec 2009 07:47:18 +0000 (08:47 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Sun, 20 Dec 2009 07:47:18 +0000 (08:47 +0100)

Trivial merge