From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Mon, 9 Jan 2017 15:51:14 +0000 (+0100)
Subject: Merge branch '2.9-maintenance'
X-Git-Tag: 2.10~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=793ddd4ae98a3c5dff1ff5364bc69cf7e92960da;p=thirdparty%2Fjinja.git

Merge branch '2.9-maintenance'
---

793ddd4ae98a3c5dff1ff5364bc69cf7e92960da