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)
commit13084b3ea11689e3881c216f1f1e0f957e741532
treee30f8b61a5dc27baecd6d3bcbc1c39d26e1e6520
parentfc494b5927df561d84bccc48e10c4028b7017cb9
parentb3d18327d965802b1f29bca44e99a04ac3f2f4db
Merge branch 'master' of git+ssh://zobel@db.debian.org/git/dsa-wiki