Merge branch 'master' of ssh://db.debian.org/git/dsa-wiki
authorPeter Palfrader <peter@palfrader.org>
Fri, 3 Jul 2009 21:08:38 +0000 (23:08 +0200)
committerPeter Palfrader <peter@palfrader.org>
Fri, 3 Jul 2009 21:08:38 +0000 (23:08 +0200)
commit4ca49dedd8a8a1e7044fef48658d3ead51dd8799
tree1dc6fa5d19b2fdeececd23fc3e5d93084da13c2d
parentd3038a24134b388cedbca31487b55034109c34d4
parent8381d985105e1349c7d0e73a3775b36003239d75
Merge branch 'master' of ssh://db.debian.org/git/dsa-wiki

* 'master' of ssh://db.debian.org/git/dsa-wiki:
  integrate sgran's fixes