Merge branch 'master' into cvs

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 6109a70127a709b519d95e5c03bc5440c9f9f81e..488aef8661811069ef88072d46ef28233401652a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,12 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low
 
   * Add French basewiki translation from the Debian French l10n team,
     including Philippe Batailler, Alexandre Dupas, and Steve Petruzzello.
+  * Expand banned_users; it can now include PageSpecs, which
+    allows banning by IP address.
+  * underlay: Also allow configuring additional directories to search 
+    for template files in.
+  * Fix parsing web commits from ipv6 addresses.
+  * Add genwrapper hook, that can be used to add code into the C wrapper.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 02 Sep 2009 15:01:27 -0400