nice message if someone tries to revert a merge commit

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 527dd788407d54f2e7031d9b9c747eed7ebfab94..b304e4b8645ffb33017784913787733e4f430bf7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,32 @@
-ikiwiki (3.20100927) UNRELEASED; urgency=low
+ikiwiki (3.20101023) unstable; urgency=low
 
-  * Fix test suite failure on other side of date line.
+  * Fix typo that broke anonymous git push.
+  * Fix web reversion when the srcdir is in a subdir of the git repo.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 23 Oct 2010 16:36:50 -0400
 
- -- Joey Hess <joeyh@debian.org>  Wed, 29 Sep 2010 11:58:23 -0400
+ikiwiki (3.20101019) unstable; urgency=low
+
+  * Fix test suite failure on other side of date line.
+  * htmltidy: Allow configuring tidy parameters in setup file.
+    (W. Trevor King)
+  * Updated French program translation. Closes: #598918
+  * git: Added new rcs_revert and rcs_preprevert hooks.
+  * recentchanges: Add revert buttons to RecentChanges page, and
+    implement web-based reversion interface.
+  * Thanks to Peter Gammie for his assistance with the web-based reversion
+    feature.
+  * actiontabs: More consistent styling of Hn tags.
+  * websetup: Fix saving of advanced mode changes.
+  * websetup: Fix defaults of checkboxes in advanced mode.
+  * monotone: Fix recentchanges page when the srcdir is not at the top
+    of the monotone workspace. Thanks, tommyd.
+  * img: If a class is specified, don't also put the img in the img
+    class.
+  * auto-blog.setup: Don't enable opendiscussion by default; require users be
+    logged in to post comments.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 19 Oct 2010 02:32:23 -0400
 
 ikiwiki (3.20100926) unstable; urgency=low