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

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

0a6f850d9a4e53950cd89cfec5c91a5a082ed7af