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

Merge branch '2.9-maintenance'
---

5a8e77151e793e775e1ae7b09cfa531d08c1f61e