From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Fri, 20 Nov 2015 09:05:39 +0000 (+0100)
Subject: Merge branch '2.8-maintenance'
X-Git-Tag: 2.9~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b78f2617b04cc549ed5fea4eca944c4d8054d187;p=thirdparty%2Fjinja.git

Merge branch '2.8-maintenance'
---

b78f2617b04cc549ed5fea4eca944c4d8054d187