Merge remote-tracking branch 'origin/master'

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

diff --git a/debian/changelog b/debian/changelog
index d852c6b612f98523012303242cc96f88d0766770..7f1888198827e0081b06715f6d386fe5a66a942f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ ikiwiki (3.20110906) UNRELEASED; urgency=low
 
   * searchquery.tmpl: Track escaping change in upstream template.
     Thanks Olly Betts for review.
+  * svn: Support subversion 1.7, which does not have .svn in each
+    subdirectory.
+  * rst: import docutils lazily, to avoid errors during ikiwiki --setup.
+    Closes: #637604 (Thanks, smcv)
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Sep 2011 10:47:13 -0400