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

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 93c684b0338a9d3ecd608c40dd5c14ee06ba7c76..152689948baaaba8c88caaec1c955955ffc4eef5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,13 @@
-ikiwiki (2.51) UNRELEASED; urgency=low
+ikiwiki (2.52) UNRELEASED; urgency=low
+
+  * attachment: New plugin for uploading and managing attachments.
+    (Sponsored by The TOVA Company.)
+  * If attachments are not enabled, configure CGI.pm to disable file
+    uploads by default. (An anti-DOS measure.)
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 30 Jun 2008 19:56:28 -0400
+
+ikiwiki (2.51) unstable; urgency=low
 
   * Improve toplevel parentlink to link directly to index.html when usedirs is
     disabled.
@@ -32,7 +41,7 @@ ikiwiki (2.51) UNRELEASED; urgency=low
     will only get the body during page preview.
   * toggle: Deal with preview mode when adding javascript.
 
- -- Joey Hess <joeyh@debian.org>  Sun, 15 Jun 2008 15:03:33 -0400
+ -- Joey Hess <joeyh@debian.org>  Sun, 29 Jun 2008 14:09:37 -0400
 
 ikiwiki (2.50) unstable; urgency=low