From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sat, 18 May 2013 11:06:06 +0000 (+0100)
Subject: Merge branch 'master' of github.com:mitsuhiko/jinja2
X-Git-Tag: 2.7~67^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=587d61b7f8a8a0b4fec100f531f73ab62d9dd121;p=thirdparty%2Fjinja.git

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

587d61b7f8a8a0b4fec100f531f73ab62d9dd121