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

Merge branch '2.9-maintenance'
---

220659b52d5a072d7d8344c3ade024445fa9f2e6