Merge commit 'origin/debian-testing' into debian-testing

diff --combined debian/changelog
index ede97615165af304f5fba8e15f24fc00dfedc9aa,7cd659962057b243658060ebe208635382637326..ff408c55c9acbfeb50a058f64f8ae16f6184baa8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,3 +1,9 @@@
 +ikiwiki (2.53.2) testing-proposed-updates; urgency=low
 +
 +  * Fix bad patch backport that broke generation of rss/atom feeds. Closes: #498224
 +
 + -- Joey Hess <joeyh@debian.org>  Mon, 08 Sep 2008 11:40:27 -0400
 +
  ikiwiki (2.53.1) testing-proposed-updates; urgency=low
  
    * Backported all relevant bug fixes from mainline to debian testing.
@@@ -18,9 -12,10 +18,10 @@@
      work. Markdown removes one level of escaping.
    * Add a postscan hook.
    * search: Use postscan hook, avoid updating index when previewing.
-   * search: Fixes for title stemming, and use better term for tags. (Gabriel McManus)
-     (Rebuilding the wiki on upgrade to this version is recommended if you use the
-     search plugin.)
+   * search: Fixes for title stemming, and use better term for tags.
+     (Gabriel McManus)
+     (Rebuilding the wiki on upgrade to this version is recommended if you
+     use the search plugin.)
    * meta: fix title() PageSpec (DOS). Closes: #497444
    * Really fix bug with links to pages with names containing colons. 
      Previous fix mised a few cases.