From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Tue, 24 Jan 2017 15:36:16 +0000 (+0100)
Subject: Merge branch '2.9-maintenance'
X-Git-Tag: 2.10~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fcf45162d72c205568afcc3407c16037a82b6de;p=thirdparty%2Fjinja.git

Merge branch '2.9-maintenance'
---

0fcf45162d72c205568afcc3407c16037a82b6de