merge

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 1408e4dce6e61091d70d84c3dd98cbd8e6c91a4f..eb8248804ec1c5fd1259a66598b33c0afb837c3c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ikiwiki (3.20091203) UNRELEASED; urgency=low
+
+  * cvs: Add missing bit to Automator.
+  * Add complete Spanish basewiki translation done by Fernando Gonzalez de
+    Requena.
+  * Improve javascript onload handling.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 02 Dec 2009 17:22:21 -0500
+
 ikiwiki (3.20091202) unstable; urgency=low
 
   * meta: Generate meta description tags even when the html scrubber is
@@ -33,7 +42,7 @@ ikiwiki (3.20091113) unstable; urgency=low
   * httpauth: Add cgiauthurl setting that can be used to do http basic auth
     only when ikiwiki needs authentication, rather than for any access to 
     the cgi/wiki.
-  * inline: Do not generated feeds for nested inlines.
+  * inline: Do not generate feeds for nested inlines.
   * inline: Allow direct inclusion of non-page files in raw mode.
   * inline: Fix display of all pages when archive=yes or show=0 are used.