From: Adrian Moennich <adrian@planetcoding.net>
Date: Tue, 22 Aug 2017 21:17:15 +0000 (+0200)
Subject: Merge branch '2.9-maintenance'
X-Git-Tag: 2.10~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3b6368e90a32864f58ea9e6d289a975765f9b40;p=thirdparty%2Fjinja.git

Merge branch '2.9-maintenance'
---

f3b6368e90a32864f58ea9e6d289a975765f9b40