From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Tue, 12 Apr 2016 19:44:39 +0000 (+0200)
Subject: Merge branch '2.8-maintenance'
X-Git-Tag: 2.9~27^2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9837970fa8638bc642c1ceaf3ec12bb953a410e5;p=thirdparty%2Fjinja.git

Merge branch '2.8-maintenance'
---

9837970fa8638bc642c1ceaf3ec12bb953a410e5