From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 29 Dec 2016 13:17:42 +0000 (+0100)
Subject: Merge branch '2.8-maintenance'
X-Git-Tag: 2.9~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3097b97ef34a4d00f5bc94738bf654b4dfbe8e35;p=thirdparty%2Fjinja.git

Merge branch '2.8-maintenance'
---

3097b97ef34a4d00f5bc94738bf654b4dfbe8e35