From: Joey Hess <joey@kitenet.net>
Date: Sun, 18 Mar 2012 18:30:54 +0000 (-0400)
Subject: merged trail3-integrated
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9c30a00b24f38421732b23b4223c389ee697796e;p=ikiwiki.git

merged trail3-integrated
---

diff --git a/doc/plugins/trail/discussion.mdwn b/doc/plugins/trail/discussion.mdwn
index d00b5589a..8b3981f0c 100644
--- a/doc/plugins/trail/discussion.mdwn
+++ b/doc/plugins/trail/discussion.mdwn
@@ -37,3 +37,7 @@ can't be the same hook, because it has to run after pagespecs
 work, but before sorting.
 
 --[[smcv]]
+
+> I've merged trail3-integrated, but not prebuild. I don't exactly dislike
+> prebuild, but dunno that the hook prolieration is worth the minor cleanup
+> it allows in trail. --[[Joey]]