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-2~21
X-Git-Url: https://git.deb.at/?p=pkg%2Fblosxom.git;a=commitdiff_plain;h=ab610a555d860fd48269af15fae725e640489914;hp=b6f3fe1110df4c616724be11638a5f2d32bc375b

Merge commit 'debian/2.1.1-1' into debian

Conflicts:

	debian/changelog
---

diff --git a/debian/changelog b/debian/changelog
index 1c38eed..e795dec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+blosxom (2.1.1-2) unstable; urgency=low
+
+  * Corrected Axel's email address in Uploaders field, sorry.
+
+ -- Gerfried Fuchs <rhonda@debian.at>  Wed, 20 Aug 2008 13:44:35 +0200
+
 blosxom (2.1.1-1) unstable; urgency=low
 
   [ Gerfried Fuchs ]
diff --git a/debian/control b/debian/control
index 0644ce9..3390305 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: blosxom
 Section: web
 Priority: optional
 Maintainer: Gerfried Fuchs <rhonda@debian.at>
-Uploaders: Axel Beckert <be@deuxchevaux.org>
+Uploaders: Axel Beckert <abe@deuxchevaux.org>
 Standards-Version: 3.8.0
 Homepage: http://blosxom.sourceforge.net/
 Vcs-Git: git://repo.or.cz/blosxom.git