Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index d6eebea7839ca1ac0fe2ab088060ccd02cb5457d..cae182f636ec5628fc51e5f713c87fe82aaf1860 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,14 @@
-ikiwiki (3.20100832) UNRELEASED; urgency=low
+ikiwiki (3.20100916) UNRELEASED; urgency=low
+
+  * meta: Ensure that the url specified by xrds-location is absolute.
+  * attachment: Fix attachment file size display.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 19 Sep 2010 20:13:06 -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.
@@ -27,7 +34,7 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low
   * 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