From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 29 Dec 2016 21:54:50 +0000 (+0100)
Subject: Merge branch 'master' of github.com:pallets/jinja
X-Git-Tag: 2.9~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a70e7a63eea604148ea0a2bdacf56d0102fc05d;p=thirdparty%2Fjinja.git

Merge branch 'master' of github.com:pallets/jinja
---

4a70e7a63eea604148ea0a2bdacf56d0102fc05d