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)
* 'master' of ssh://db.debian.org/git/dsa-wiki:
  integrate sgran's fixes


Trivial merge