From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 12 Jan 2017 14:55:29 +0000 (+0100)
Subject: Merge branch '2.9-maintenance'
X-Git-Tag: 2.10~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=095663c73418b0b2696a7f15ddae9e366d045d09;p=thirdparty%2Fjinja.git

Merge branch '2.9-maintenance'
---

095663c73418b0b2696a7f15ddae9e366d045d09