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

Merge branch '2.9-maintenance'
---

1e1173745b6c8f2ad98ca5eca3a215691e7fb035