reorg

diff --git a/debian/changelog b/debian/changelog
index ab10e142ed3685abc4392d62f96759855c60b7d5..662a62f8568514d2a7127511e8f54bac17dfe7c8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,13 @@
 ikiwiki (3.20100815.2) UNRELEASED; urgency=low
 
+  * Bugfix-only cherry-pick release for Debian squeeze.
+  * Fix htmlscrubber_skip to be matched on the source page, not the page it is
+    inlined into. Should allow setting to "* and !comment(*)" to scrub
+    comments, but leave your blog posts unscrubbed, etc.
+  * comments: Make postcomment() pagespec work when previewing a comment,
+    including during moderation.
+  * comments: Make comment() pagespec also match comments that are being
+    posted.
   * openid: Syntax tweak to the javascript code to make it work with MSIE 7
     (and MSIE 8 in compat mode). Thanks to Iain McLaren for reporting
     the bug and providing access to debug it.
@@ -11,13 +19,6 @@ ikiwiki (3.20100815.2) UNRELEASED; urgency=low
   * websetup: Fix defaults of checkboxes in advanced mode.
   * Fix test suite failure on other side of date line.
   * Set isPermaLink="no" for guids in rss feeds. 
-  * Fix htmlscrubber_skip to be matched on the source page, not the page it is
-    inlined into. Should allow setting to "* and !comment(*)" to scrub
-    comments, but leave your blog posts unscrubbed, etc.
-  * comments: Make postcomment() pagespec work when previewing a comment,
-    including during moderation.
-  * comments: Make comment() pagespec also match comments that are being
-    posted.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Aug 2010 11:42:55 -0400