From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Mon, 9 Jun 2008 20:19:25 +0000 (+0200)
Subject: Automated merge with ssh://team@pocoo.org/jinja2-main
X-Git-Tag: 2.0~23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f3d3d7b5f5d65161290dc3173a90513235b75c16;p=jinja2.git

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

--HG--
branch : trunk
---

f3d3d7b5f5d65161290dc3173a90513235b75c16