From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sun, 26 Jul 2009 08:39:17 +0000 (+0200)
Subject: merged.
X-Git-Tag: 2.2~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1b43b58e7af08570acd13a39af559a2ef2aeffb7;p=jinja2.git

merged.

--HG--
branch : trunk
---

1b43b58e7af08570acd13a39af559a2ef2aeffb7