Merge commit 'upstream/master' into prv/po

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

diff --git a/debian/changelog b/debian/changelog
index cba0276c384990143713afb1386df930abe024da..07062b04a72382c0a0b6fc2dbfb95e25efd209bf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.00) UNRELEASED; urgency=low
+ikiwiki (3.00) unstable; urgency=low
 
   * Remove support for GlobLists.
   * Remove support for configuring allowed attachments, locked pages,
@@ -16,8 +16,14 @@ ikiwiki (3.00) UNRELEASED; urgency=low
   * Replace blank OpenID placeholder logo with an unofficial OpenID
     logo developed by Anna Hess. The official logo does not seem destined to
     be free.
-
- -- Joey Hess <joeyh@debian.org>  Wed, 24 Dec 2008 19:49:36 -0500
+  * 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, 31 Dec 2008 15:17:47 -0500
 
 ikiwiki (2.72) unstable; urgency=low