From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Fri, 19 Oct 2007 13:51:28 +0000 (+0200)
Subject: marged
X-Git-Tag: 2.0rc1~257
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e658b734380e9947ad1d66f31ebf6e2337c4f02c;p=jinja2.git

marged

--HG--
branch : trunk
---

e658b734380e9947ad1d66f31ebf6e2337c4f02c