oops, branch returned now

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index bbca7cffe69e0e30bdeba0272333dc56a6f82907..77d17f56634142eba29174ea35e04889817fb4a3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,12 @@
-ikiwiki (3.20100324) UNRELEASED; urgency=low
+ikiwiki (3.20100404) UNRELEASED; urgency=low
+
+  * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
+  * comments: Fix missing entity encoding in title.
+  * txt: Add a special case for robots.txt.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
+
+ikiwiki (3.20100403) unstable; urgency=low
 
   * websetup: Add websetup_unsafe to allow marking other settings
     as unsafe.
@@ -25,8 +33,11 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
     used, but they are available in the session object now.)
   * page.tmpl: Add Cache-Control must-revalidate to ensure that users
     (especially of Firefox) see fresh page content.
+  * htmlscrubber: Allow colons in urls after '?'
+  * template: Search for templates in the templatedir, if they are not
+    found as pages in the wiki.
 
- -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
+ -- Joey Hess <joeyh@debian.org>  Sat, 03 Apr 2010 14:17:28 -0400
 
 ikiwiki (3.20100312) unstable; urgency=HIGH