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

Merge branch '2.9-maintenance'
---

7064298b53bdf04fff613f5237b4eaa3d24fa9c5