Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[www/ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 1960a1226fba798fdc62a67df87625e0abdfff24..832bbaa85f3662a31acbcc3d3280af8b54a2b75f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ ikiwiki (3.20100213) UNRELEASED; urgency=low
   * Rebuild wikis on upgrade to this version to get the comment counts
     added to existing pages.
   * Loosen regexp, to allow empty quoted parameters in directives.
+  * Add force_overwrite setting to make setup automator overwrite existing
+    files/directories.
+  * Fix admin openid detection in setup automator, and avoid prompting
+    for a password.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 14 Feb 2010 17:02:10 -0500