X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/0a0366b8c6d280fff06e4edd5639dd57605a86e0..021676e489f9b79a50338635ad654f31eb5575fe:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index d2f0c334e..91ff0964b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,28 @@
-ikiwiki (3.20101024) UNRELEASED; urgency=low
+ikiwiki (3.20101113) UNRELEASED; urgency=low
+
+  * websetup: Fix encoding problem when restoring old setup file.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 16 Nov 2010 14:23:47 -0400
+
+ikiwiki (3.20101112) unstable; urgency=HIGH
 
   * 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.
   * htmltidy, sortnaturally: Add missing checkconfig hook
     registration. Closes: #601912
-
- -- Joey Hess <joeyh@debian.org>  Mon, 25 Oct 2010 22:30:29 -0400
+    (Thanks, Craig Lennox and Tuomas Jormola)
+  * git: Use author date, not committer date. Closes: #602012
+    (Thanks, Tuomas Jormola)
+  * 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. CVE-2010-1673
+  * comments: Make postcomment() pagespec work when previewing a comment,
+    including during moderation. CVE-2010-1673
+  * comments: Make comment() pagespec also match comments that are being
+    posted. CVE-2010-1673
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 12 Nov 2010 00:36:06 -0400
 
 ikiwiki (3.20101023) unstable; urgency=low