Merge commit 'debian/2.1.1-1' into debian

Conflicts:

	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 1c38eed80da960f9d187a4474c26b74356c2f54a..e795decdaae9533226bcc796a9898cba50d59f96 100644 (file)
--- 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 0644ce9ddd7c830e4fdb7bb8a55a07b06a1e5ed7..33903050df8871b9693469f30f49ee42810cf9d4 100644 (file)
--- 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