From: intrigeri <intrigeri@boum.org>
Date: Sun, 11 Jul 2010 09:27:54 +0000 (+0200)
Subject: the filter-full branch works nicely
X-Git-Tag: 3.20100722~54
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ea3926bd87c227ed654dc868e8e027029baed413;p=ikiwiki.git

the filter-full branch works nicely
---

diff --git a/doc/bugs/po_vs_templates.mdwn b/doc/bugs/po_vs_templates.mdwn
index 7bc56676e..9fd0de694 100644
--- a/doc/bugs/po_vs_templates.mdwn
+++ b/doc/bugs/po_vs_templates.mdwn
@@ -40,4 +40,9 @@ This has been fixed in my po branch.
 >> your po branch and remove your other workarounds so I can merge?
 >> --[[Joey]]
 
+>>> I merged your filter-full branch into my po branch and reverted my
+>>> other workarounds. According to my tests this works ok. I'm glad
+>>> you found this solution, as I didn't like changing the filter
+>>> prototype. I believe you can now merge this code. --[[intrigeri]]
+
 [[!tag patch]]