Merge branch 'next'

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 3c52bed3a08cd6b481858b8f926e6502afecfee3..51c9617f7325e10ba3e63d1b0563acde711f75b4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,9 @@ ikiwiki (3.00) UNRELEASED; urgency=low
   * comments: Add cache avoidance.
   * htmlbalance: Demand-load HTML::TreeBuilder to avoid failing test suite
     if it is not present.
+  * French translation update from Philippe Batailler. Closes: #510216
+  * websetup: Avoid a crash when a new array setup item has been added in 
+    a new ikiwiki release, and is thus not present in the setup file yet.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 24 Dec 2008 19:49:36 -0500