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

Merge branch '2.9-maintenance'
---

05b0a7e4345176a972f8af817ef8c4b851ab19c2