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)
commit048c454849e6c7372dc794ba43a64c2678b078e8
treecf385bf7c2286fd78e2bdc2bd8c621b560cb8b07
parent0ae7a443e3f7883c7e54058a9642ef93c3508501
parent23e6d62cbc0b307133f3ede7b04265b8b68b9ada
Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki

* 'master' of git+ssh://db.debian.org/git/dsa-wiki:
  remove bartok