From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sat, 2 May 2009 12:22:41 +0000 (+0200)
Subject: Automated merge with ssh://team@pocoo.org/jinja2-main
X-Git-Tag: 2.2~15^2~3
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=671e06bdc5678d2b207112499868803f7111aa3d;p=jinja2.git

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

--HG--
branch : trunk
---

671e06bdc5678d2b207112499868803f7111aa3d