Merge commit 'upstream/master' into pub/po

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

diff --git a/debian/changelog b/debian/changelog
index 51b5121fb093bbb3348e830932dfdbfd21815d9f..f7d336de26a626edba5963ed6886046cd5690bff 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,13 @@
-ikiwiki (3.10) UNRELEASED; urgency=low
+ikiwiki (3.11) unstable; urgency=low
+
+  * Add new hooks: canremove, canrename, rename. (intrigeri)
+  * rename: Refactor subpage rename handling code into rename hook. (intrigeri)
+  * po: New plugin, suporting translation of wiki pages using po files.
+    (intrigeri)
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 20 Apr 2009 19:40:25 -0400
+
+ikiwiki (3.10) unstable; urgency=low
 
   * darcs: Finally added support for this VCS, thanks to many
     contributors:
@@ -14,7 +23,7 @@ ikiwiki (3.10) UNRELEASED; urgency=low
   * inline: Add author info to archive display.
   * Add a microblog template that is useful for inlining microblogging posts.
 
- -- Joey Hess <joeyh@debian.org>  Sat, 04 Apr 2009 17:47:36 -0400
+ -- Joey Hess <joeyh@debian.org>  Sat, 18 Apr 2009 19:40:25 -0400
 
 ikiwiki (3.09) unstable; urgency=low