From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Mon, 4 May 2009 06:39:23 +0000 (+0200)
Subject: Merged
X-Git-Tag: 2.2~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d1442c858407b630b0c2dd5c780ed44ab6f96728;p=jinja2.git

Merged

--HG--
branch : trunk
---

d1442c858407b630b0c2dd5c780ed44ab6f96728