From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sun, 19 May 2013 10:18:59 +0000 (+0100)
Subject: Merge branch 'master' of github.com:mitsuhiko/jinja2
X-Git-Tag: 2.7~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8dc9d4d6cb6bbfd3bee9d32cc25fb294dc60cd78;p=thirdparty%2Fjinja.git

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

8dc9d4d6cb6bbfd3bee9d32cc25fb294dc60cd78