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

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

diff --git a/debian/changelog b/debian/changelog
index 193600f454c6c8d69bf2cf6eff14ae4c60e11ab5..da0a04ac40cf30e3610fca9478a9191c58760d5f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,11 +9,13 @@ ikiwiki (3.20110716) UNRELEASED; urgency=low
   * mercurial: Make both rcs_getctime and rcs_getmtime fast. (Daniel Andersson)
   * mercurial: Implement rcs_diff. (Daniel Andersson)
   * po: Add `LANG_CODE` and `LANG_NAME` template variables. (intrigeri)
-  * Fix typo in Danish translation of shortcuts page that caused expoentional
+  * Fix typo in Danish translation of shortcuts page that caused exponential
     regexp blowup.
   * Fix escaping of html entities in permalinks.
   * Fix escaping of html entities in tag names.
   * Avoid using named capture groups in heredoc code for oldperl compatability.
+  * Put in a workaround for #622591, by ensuring Search::Xapian gets loaded
+    before Image::Magick.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 19 Jul 2011 11:22:52 -0400