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

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

--HG--
branch : trunk
---

b6fc38c58d787ef3620ffd91065b0a9641e6fce3