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

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

--HG--
branch : trunk
---

cb3bd65e0624fae054b6ff1b479c0ba730ca5649