From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Tue, 24 Jan 2017 19:16:20 +0000 (+0100)
Subject: Merge branch '2.9-maintenance'
X-Git-Tag: 2.10~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d927c887507cfc700c9439f01aa14cee47afd4fd;p=thirdparty%2Fjinja.git

Merge branch '2.9-maintenance'
---

d927c887507cfc700c9439f01aa14cee47afd4fd