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

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

--HG--
branch : trunk
---

149aa4eea904488c659d5af7da03ae7d65567908