Merge branch 'master' into next

diff --cc IkiWiki.pm
Simple merge

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

diff --cc debian/changelog
index ddb979c316fa9ddfff6f0f5c608c33cea10b2b81,0fa6590f0efa6f390594dca2c9f631c090e84d47..2a872bb0ea186e6bbdd2870617ff1e21b57ab6b4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -23,8 -5,10 +23,10 @@@ ikiwiki (2.72) unstable; urgency=lo
    * camelcase: Add camelcase_ignore setting.
    * googlecalendar: Add runtime deprecation warning.
    * comments: Deal with users entering unqualified or partial urls.
+   * inline: Run format hook first, to ensure other format hooks can affect
+     inlined content.  Closes: #509710
  
 - -- Joey Hess <joeyh@debian.org>  Mon, 22 Dec 2008 19:02:16 -0500
 + -- Joey Hess <joeyh@debian.org>  Wed, 24 Dec 2008 19:49:32 -0500
  
  ikiwiki (2.71) unstable; urgency=low
  

diff --cc doc/plugins/write.mdwn
Simple merge