From: Peter Palfrader Date: Fri, 3 Jul 2009 21:08:38 +0000 (+0200) Subject: Merge branch 'master' of ssh://db.debian.org/git/dsa-wiki X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=4ca49dedd8a8a1e7044fef48658d3ead51dd8799;p=mirror%2Fdsa-wiki.git Merge branch 'master' of ssh://db.debian.org/git/dsa-wiki * 'master' of ssh://db.debian.org/git/dsa-wiki: integrate sgran's fixes --- 4ca49dedd8a8a1e7044fef48658d3ead51dd8799