From: David Lord <davidism@gmail.com>
Date: Mon, 6 May 2019 14:24:46 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/2.10.x'
X-Git-Tag: 2.11.0~96
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2140487aae1a884afa1f10330d8849cdca62eae;p=thirdparty%2Fjinja.git

Merge remote-tracking branch 'origin/2.10.x'
---

e2140487aae1a884afa1f10330d8849cdca62eae