From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 26 Dec 2008 21:11:13 +0000 (-0500)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.00~4^2~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c4f3d0554a02eba93d94d4c0914f4afddf85274b;p=ikiwiki.git

Merge branch 'master' into next
---

c4f3d0554a02eba93d94d4c0914f4afddf85274b
diff --cc debian/changelog
index ddb979c31,0fa6590f0..2a872bb0e
--- a/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