From: David Lord <davidism@gmail.com>
Date: Wed, 4 Sep 2019 15:25:09 +0000 (-0700)
Subject: Merge branch '2.10.x'
X-Git-Tag: 2.11.0~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=436f00b7763b8cba14b287b9b8ce88c0e1af6fc9;p=thirdparty%2Fjinja.git

Merge branch '2.10.x'
---

436f00b7763b8cba14b287b9b8ce88c0e1af6fc9