From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Mon, 3 Nov 2008 22:55:19 +0000 (+0100)
Subject: Merge commit 'local/master' into ubuntu-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=aa2e0fe2326ca54e2cc46959968ba6234f105e25;hp=aa2e0fe2326ca54e2cc46959968ba6234f105e25;p=deb%2Fpackages.git

Merge commit 'local/master' into ubuntu-master

Conflicts:
	lib/Deb/Versions.pm
---