Merge commit 'upstream/master' into pub/po

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 4bbeac1d96ce407941587d349cf80492986aae63..f7d336de26a626edba5963ed6886046cd5690bff 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+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