Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki
authorMartin Zobel-Helas <zobel@debian.org>
Sat, 5 Feb 2011 09:49:05 +0000 (10:49 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Sat, 5 Feb 2011 09:49:05 +0000 (10:49 +0100)
* 'master' of git+ssh://db.debian.org/git/dsa-wiki:
  remove bartok


Trivial merge