From: David Lord <davidism@gmail.com>
Date: Fri, 4 Oct 2019 19:53:44 +0000 (-0700)
Subject: Merge branch '2.10.x'
X-Git-Tag: 2.11.0~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e68d9b870536d1d019b6f26750d4c68a89df25e3;p=thirdparty%2Fjinja.git

Merge branch '2.10.x'
---

e68d9b870536d1d019b6f26750d4c68a89df25e3