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

Merge branch '2.9-maintenance'
---

ad5685f3cbd31ba3fd6502c4a07aa9f18487b680