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

Merge branch '2.9-maintenance'
---

95fb2bf51a74de62863c740d6ad82ee0c7356432