From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sat, 7 Jan 2017 22:23:07 +0000 (+0100)
Subject: Merge branch '2.9-maintenance'
X-Git-Tag: 2.10~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8df1f7392b60197d9859a0e09f2bea859769c30;p=thirdparty%2Fjinja.git

Merge branch '2.9-maintenance'
---

a8df1f7392b60197d9859a0e09f2bea859769c30