From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sat, 7 Jan 2017 15:57:25 +0000 (+0100)
Subject: Merge branch '2.9-maintenance'
X-Git-Tag: 2.10~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7685ea59db457caf920a20d39fb4a3339a690b4c;p=thirdparty%2Fjinja.git

Merge branch '2.9-maintenance'
---

7685ea59db457caf920a20d39fb4a3339a690b4c