Merge remote branch 'remotes/origin/master'

1 files changed, 26 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index 53bee5df6..f6ca122a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,19 @@
-ikiwiki (3.20100927) UNRELEASED; urgency=low
+ikiwiki (3.20101024) UNRELEASED; urgency=low
+
+  * txt: Fix display when used inside a format directive.
+  * highlight: Ensure that other, more-specific format plugins,
+    like txt are used in preference to this one in case of ties.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 25 Oct 2010 22:30:29 -0400
+
+ikiwiki (3.20101023) unstable; urgency=low
+
+  * 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
+
+ikiwiki (3.20101019) unstable; urgency=low
 
   * Fix test suite failure on other side of date line.
   * htmltidy: Allow configuring tidy parameters in setup file.
@@ -10,8 +25,16 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low
   * Thanks to Peter Gammie for his assistance with the web-based reversion
     feature.
   * actiontabs: More consistent styling of Hn tags.
-
- -- Joey Hess <joeyh@debian.org>  Wed, 29 Sep 2010 11:58:23 -0400
+  * 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