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

Merge branch '2.9-maintenance'
---

222b3624dec607d211fb38c929c9f6163927356e