From: Christopher Grebs <entequak@googlemail.com>
Date: Thu, 10 Jul 2008 09:52:37 +0000 (+0200)
Subject: Automated merge with http://dev.pocoo.org/hg/jinja2-main/
X-Git-Tag: 2.0~5^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=968ad5a681e451f02259015f5d05e8db0c611d72;p=jinja2.git

Automated merge with dev.pocoo.org/hg/jinja2-main/

--HG--
branch : trunk
---

968ad5a681e451f02259015f5d05e8db0c611d72