From: Christoph Hack <christoph@tux21b.org>
Date: Sun, 13 Apr 2008 21:37:02 +0000 (+0200)
Subject: Automated merge with ssh://dev.pocoo.org/jinja2-main
X-Git-Tag: 2.0rc1~172
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4f11d740b19801468cfc62197624373598103750;p=jinja2.git

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

--HG--
branch : trunk
---

4f11d740b19801468cfc62197624373598103750