From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Tue, 13 Sep 2011 21:35:34 +0000 (+0200)
Subject: Merge branch 'master' of github.com:mitsuhiko/jinja2
X-Git-Tag: 2.7~126
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec9e8eb7937f1ac6c6912f2b2bf18644bd1bbf00;p=thirdparty%2Fjinja.git

Merge branch 'master' of github.com:mitsuhiko/jinja2
---

ec9e8eb7937f1ac6c6912f2b2bf18644bd1bbf00