From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Mon, 9 Jan 2017 10:03:10 +0000 (+0100)
Subject: Merge branch '2.9-maintenance' of github.com:pallets/jinja into 2.9-maintenance
X-Git-Tag: 2.9.4~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7d4ec51f256568c3f0181a830cbc6b4cf0dc222;p=thirdparty%2Fjinja.git

Merge branch '2.9-maintenance' of github.com:pallets/jinja into 2.9-maintenance
---

a7d4ec51f256568c3f0181a830cbc6b4cf0dc222