From: Mark Hymers <mhy@debian.org>
Date: Sun, 1 Nov 2009 09:22:53 +0000 (+0000)
Subject: Merge commit 'ftpmaster/master'
X-Git-Tag: debian-r/squeeze~905^2~1^2~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=37818276a5aba97d97763420a7655d2350dad747;p=dak.git

Merge commit 'ftpmaster/master'
---

37818276a5aba97d97763420a7655d2350dad747