Merge commit 'debian/2.1.1-1' into debian

[matthijs/upstream/blosxom.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 3867bdcbfcfb86d1021a1a461464ae596a546038..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 ]
@@ -8,12 +14,13 @@ blosxom (2.1.1-1) unstable; urgency=low
     Co-Maintainer. Welcome on board. :)
   * Update debian/README.Debian with more current informations, especially
     related to referencing the proper URLs (closes: #492985)
+  * Add the moved $encode_xml_entities config option to blosxom.conf, too.
 
   [ Axel Beckert ]
   * Clearified debian/NEWS.Debian with respect to rss aggregators.
   * Fix copyright year information for Rael on blosxom.cgi.
 
- -- Gerfried Fuchs <rhonda@debian.at>  Wed, 06 Aug 2008 20:37:13 -0300
+ -- Gerfried Fuchs <rhonda@debian.at>  Thu, 07 Aug 2008 17:15:31 -0300
 
 blosxom (2.1.0-1) unstable; urgency=low