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

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

diff --git a/debian/changelog b/debian/changelog
index 457bd6a67ec18bebaecdaa80e23867ce1b4deed3..da2cc73bbf9295e7c4df924debb4a33bf63cd308 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,18 @@
-ikiwiki (3.20120204) UNRELEASED; urgency=low
+ikiwiki (3.20120517) UNRELEASED; urgency=low
+
+  * mirrorlist: Add mirrorlist_use_cgi setting that avoids usedirs or
+    other config differences by linking to the mirror's CGI. (intrigeri)
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 03 Jun 2012 13:15:22 -0400
+
+ikiwiki (3.20120516) unstable; urgency=high
+
+  * meta: Security fix; add missing sanitization of author and authorurl.
+    CVE-2012-0220 Thanks, Raúl Benencia
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 16 May 2012 19:51:27 -0400
+
+ikiwiki (3.20120419) unstable; urgency=low
 
   * Remove dead link from plugins/teximg. Closes: #664885
   * inline: When the pagenames list includes pages that do not exist, skip
@@ -26,9 +40,9 @@ ikiwiki (3.20120204) UNRELEASED; urgency=low
   * trail: Improve CSS, also display trail links at bottom of page,
     and a bug fix. (smcv)
 
- -- Joey Hess <joeyh@debian.org>  Wed, 21 Mar 2012 14:33:14 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu, 19 Apr 2012 15:32:07 -0400
 
-ikiwiki (3.20120203) unstable; urgency=low
+ikiwiki (3.20120319) unstable; urgency=low
 
   * osm: New plugin to embed an OpenStreetMap into a wiki page.
     Supports waypoints, tags, and can even draw paths matching