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

Merge branch '2.9-maintenance'
---

04644ce004f6e930d3d574ddee08bb36b4e34124