Merge branch 'joey' into revert

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 46401b58cbb8b51d4cd3a860af0a982e76b89eb3..527dd788407d54f2e7031d9b9c747eed7ebfab94 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,22 @@
-ikiwiki (3.20100832) UNRELEASED; urgency=low
+ikiwiki (3.20100927) UNRELEASED; urgency=low
+
+  * Fix test suite failure on other side of date line.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 29 Sep 2010 11:58:23 -0400
+
+ikiwiki (3.20100926) unstable; urgency=low
+
+  * meta: Ensure that the url specified by xrds-location is absolute.
+  * attachment: Fix attachment file size display.
+  * Propigate PATH into wrapper.
+  * htmlbalance: Fix compatibility with HTML::Tree 4.0. (smcv)
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 26 Sep 2010 23:02:54 -0400
+
+ikiwiki (3.20100915) unstable; urgency=low
 
   * needsbuild hook interface changed; the hooks should now return
-    the modified array of things that need built. (Backwards compatability
+    the modified array of things that need built. (Backwards compatibility
     code keeps plugins using the old interface working.)
   * Remove PATH overriding code in ikiwiki script that was present to make
     perl taint checking happy, but taint checking is disabled.
@@ -22,8 +37,12 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low
   * external: Disable RPC::XML's "smart" encoding, which sent ints
     for strings that contained only a number, fixing a longstanding crash
     of the rst plugin.
+  * git: When updating from remote, use git pull --prune, to avoid possible
+    errors from conflicting obsolete remote branches.
+  * cutpaste: Fix bug that occured in some cases involving inlines when
+    text was pasted on a page before being cut.
 
- -- Joey Hess <joeyh@debian.org>  Tue, 07 Sep 2010 12:08:05 -0400
+ -- Joey Hess <joeyh@debian.org>  Wed, 15 Sep 2010 16:29:01 -0400
 
 ikiwiki (3.20100831) unstable; urgency=low