changelog

diff --cc IkiWiki/Plugin/inline.pm
Simple merge

diff --cc debian/changelog
index d6b71eaa3f39cb95d826f6684b6601d6938006a0,c8db76966c97c4cd156d0227219b5b35c7f8f54b..3bc2a7e298435c2f51e285348474b2411841ebb2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,3 +1,25 @@@
 +ikiwiki (3.20120203) UNRELEASED; urgency=low
 +
 +  * Fix a snail mail address. Closes: #659158
 +  * openid-jquery.js: Update URL of Wordpress favicon. Closes: #660549
 +  * Drop the version attribute on the generator tag in Atom feeds
 +    to make builds more reproducible. Closes: #661569 (Paul Wise)
 +  * shortcut: Support Wikipedia's form of url-encoding for unicode
 +    characters, which involves mojibake. Closes: #661198
 +  * osm: New plugin to embed an OpenStreetMap into a wiki page.
 +    Supports waypoints, tags, and can even draw paths matching
 +    wikilinks between pages containing waypoints.
 +    Thanks to Blars Blarson and Antoine Beaupré, as well as the worldwide
 +    OpenStreetMap community for this utter awesomeness.
 +  * Add a few missing jquery UI icons to attachment upload widget underlay.
 +  * URI escape filename when generating the diffurl.
++  * trail: New plugin to add navigation trails through pages via Next and
++    Previous links. Trails can easily be added to existing inlines by setting
++    trail=yes in the inline.
++    Thanks to Simon McVittie for his persistance developing this feature.
 +
 + -- Joey Hess <joeyh@debian.org>  Wed, 08 Feb 2012 16:07:00 -0400
 +
  ikiwiki (3.20120202) unstable; urgency=low
  
    * mdwn: Added nodiscount setting, which can be used to avoid using the