Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki
authorMartin Zobel-Helas <zobel@debian.org>
Thu, 20 May 2010 13:49:22 +0000 (15:49 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Thu, 20 May 2010 13:49:22 +0000 (15:49 +0200)
commitfc099a9a450691fb66d7718d39519cb6341ee7f6
treefa6ae21c0d14029364346f1267166c075ed5d6e2
parentfed58418099ca769800a7b383b5514e2bce30294
parent8cedc45b3241cb9bcfe908bb5608abb7784fa2d6
Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki