From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Thu, 19 May 2016 18:59:56 +0000 (+0200)
Subject: Merge branch 'pgjones-master'
X-Git-Tag: 2.9~27^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=042dadda53120176100241422f93a42238779d40;p=thirdparty%2Fjinja.git

Merge branch 'pgjones-master'
---

042dadda53120176100241422f93a42238779d40