From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Tue, 8 Apr 2008 19:48:10 +0000 (+0200)
Subject: Automated merge with ssh://team@pocoo.org/jinja2-main
X-Git-Tag: 2.0rc1~204
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=671594bd7b0bd59f158e91f962f4c55b4e1a2ce6;p=thirdparty%2Fjinja.git

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

--HG--
branch : trunk
---

671594bd7b0bd59f158e91f962f4c55b4e1a2ce6