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

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

7e58e36cf4c54749fd29378126307b74b9494b96