From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sat, 12 Jul 2008 05:27:02 +0000 (+0200)
Subject: Automated merge with ssh://team@pocoo.org/jinja2-main
X-Git-Tag: 2.0~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=80b789545b6deef3a9eacf514a1babfecfbfe517;p=jinja2.git

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

--HG--
branch : trunk
---

80b789545b6deef3a9eacf514a1babfecfbfe517