From: Gerfried Fuchs <rhonda@debian.at>
Date: Tue, 9 Sep 2008 10:27:49 +0000 (+0200)
Subject: Merge commit 'debian/2.1.1-1' into debian
X-Git-Tag: debian/2.1.2-1~3
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=ab610a555d860fd48269af15fae725e640489914;hp=ab610a555d860fd48269af15fae725e640489914;p=matthijs%2Fupstream%2Fblosxom.git

Merge commit 'debian/2.1.1-1' into debian

Conflicts:

	debian/changelog
---