From: Mark Hymers <mhy@debian.org>
Date: Thu, 29 Oct 2009 14:14:52 +0000 (+0000)
Subject: Merge commit 'ftpmaster/master'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1ee050ceee00693a9bea2673431291ac480b8b6;p=dak

Merge commit 'ftpmaster/master'
---

f1ee050ceee00693a9bea2673431291ac480b8b6