From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sat, 3 May 2008 20:27:46 +0000 (+0200)
Subject: Automated merge with ssh://team@pocoo.org/jinja2-main
X-Git-Tag: 2.0rc1~103
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=792c759d250cbc8c3d96692b89fc94cce8aacefd;p=jinja2.git

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

--HG--
branch : trunk
---

792c759d250cbc8c3d96692b89fc94cce8aacefd