From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Fri, 31 May 2013 00:00:56 +0000 (+0100)
Subject: Merge branch 'master' of github.com:mitsuhiko/jinja2
X-Git-Tag: 2.8~113
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73c34f5a998bc0bc058d202fa3e9cee62d5684c5;p=thirdparty%2Fjinja.git

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

73c34f5a998bc0bc058d202fa3e9cee62d5684c5