From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sun, 25 May 2008 16:10:22 +0000 (+0200)
Subject: Automated merge with ssh://team@pocoo.org/jinja2-main
X-Git-Tag: 2.0rc1~19
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9cc780391b13226b8a521f214dab18edf388468d;p=jinja2.git

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

--HG--
branch : trunk
---

9cc780391b13226b8a521f214dab18edf388468d