From: Armin Ronacher Date: Tue, 25 Mar 2008 13:36:41 +0000 (+0100) Subject: Automated merge with ssh://team@pocoo.org/jinja-main X-Git-Tag: 2.0rc1~218 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4cc239aff7d53cf0fb89907fa980471b12038095;p=jinja2.git Automated merge with ssh://team@pocoo.org/jinja-main --HG-- branch : trunk --- 4cc239aff7d53cf0fb89907fa980471b12038095