Merge branch 'master' into cvs

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

diff --git a/debian/changelog b/debian/changelog
index ee8e7402772793da8d29ca2e9e6c2289df9d38d1..2e178171349e37fbb85f7890fb37c4eeb6dd724f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+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.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 02 Sep 2009 15:01:27 -0400
+
 ikiwiki (3.1415926) unstable; urgency=high
 
   [ Joey Hess ]
@@ -43,7 +55,7 @@ ikiwiki (3.1415926) unstable; urgency=high
 
   [ Josh Triplett ]
   * teximg: Replace the insufficient blacklist with the built-in security
-    mechanisms of TeX.
+    mechanisms of TeX. (CVE-2009-2944)
 
  -- Joey Hess <joeyh@debian.org>  Sun, 30 Aug 2009 15:20:46 -0400