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

Merge branch '2.9-maintenance'
---

2ed03c6d6bd0662a97a23f9b860419629206218d