From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sun, 25 Oct 2009 11:46:41 +0000 (+0100)
Subject: Automated merge with ssh://team@pocoo.org/jinja2-main
X-Git-Tag: 2.3~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e249a0c09e888aee7785e8918a9baabe31016ff;p=thirdparty%2Fjinja.git

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

--HG--
branch : trunk
---

6e249a0c09e888aee7785e8918a9baabe31016ff