From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sun, 21 Sep 2008 14:21:34 +0000 (+0200)
Subject: Automated merge with ssh://team@pocoo.org/jinja2-main
X-Git-Tag: 2.1~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5799605a1e6d0a944ad98d30f8a2dd46d8aaef9c;p=jinja2.git

Automated merge with ssh://team@pocoo.org/jinja2-main

--HG--
branch : trunk
---

5799605a1e6d0a944ad98d30f8a2dd46d8aaef9c