From: Mark Hymers <mhy@debian.org>
Date: Wed, 28 Oct 2009 10:50:53 +0000 (+0000)
Subject: Merge commit 'ftpmaster/master'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fa1f22b70c6ee46aea78ee40b9797a574d7c583;p=dak

Merge commit 'ftpmaster/master'
---

1fa1f22b70c6ee46aea78ee40b9797a574d7c583