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

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

diff --git a/debian/changelog b/debian/changelog
index 730cae1e247f537f0ac8e6456224b857a237664c..a09c8e2288828e3c0302ede52c49ff65e9bf71d9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,8 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
   * calendar: Allow negative month to be specified. -1 is last month, etc.
     (And also negative years.)
   * calendar: Display year in title of month calendar.
+  * Use xhtml friendly pubdate setting.
+  * remove, rename: Add guards against XSRF attacks.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400