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

Merge commit 'ftpmaster/master'
---

d6ba7dc801a54d83b159262ad431fbe7ecea38d1