From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Tue, 7 Jul 2009 11:22:44 +0000 (+0200)
Subject: Automated merge with ssh://team@pocoo.org/jinja2-main
X-Git-Tag: 2.2~15^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e4284b546cfc8d4806c7d757f3669058de46a57;p=thirdparty%2Fjinja.git

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

--HG--
branch : trunk
---

0e4284b546cfc8d4806c7d757f3669058de46a57