From: Mike O'Connor <stew@vireo.org>
Date: Wed, 14 Jan 2009 07:59:58 +0000 (-0500)
Subject: Merge branch 'master' of https://ftp-master.debian.org/git/dak
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=b1161cd16a1079a0432c57a058cb2c47f0aba4f0;p=dak.git

Merge branch 'master' of https://ftp-master.debian.org/git/dak

Conflicts:

	web/dinstall.html
---

b1161cd16a1079a0432c57a058cb2c47f0aba4f0