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

Merge branch '2.9-maintenance'
---

c1b44690ba764108e6f14a1bed3d52f02cbac0ca