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

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

--HG--
branch : trunk
---

371cb149968a54e05dfcce3f55f26c917ff62062