From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Wed, 17 Feb 2010 07:02:52 +0000 (+0100)
Subject: Merged in changes from 2.3.1
X-Git-Tag: 2.4~30
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9164d04a5d826c8c9a8e8c36a1c4457d5b10a47e;p=jinja2.git

Merged in changes from 2.3.1

--HG--
branch : trunk
---

9164d04a5d826c8c9a8e8c36a1c4457d5b10a47e