From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Mon, 17 Sep 2007 13:34:34 +0000 (+0200)
Subject: merged
X-Git-Tag: 2.0rc1~268
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fa7f9eaca9400168a9b029fef865ea4f5399dce4;p=jinja2.git

merged

--HG--
branch : trunk
---

fa7f9eaca9400168a9b029fef865ea4f5399dce4