From: Jon Dowland <jmtd@debian.org>
Date: Tue, 27 Apr 2010 18:59:09 +0000 (+0100)
Subject: Merge branch 'debian' into debian-common
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=49cba5a9fd948c05765bf7ebb56b62db7dad2cf1;p=packages%2Fb%2Fbup.git

Merge branch 'debian' into debian-common

Conflicts:
	debian/control
	debian/rules
---

49cba5a9fd948c05765bf7ebb56b62db7dad2cf1