From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Wed, 11 Mar 2015 20:26:50 +0000 (+0100)
Subject: Merge branch 'adamchainz-master'
X-Git-Tag: 2.8~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1851eb649c4ae463b261d268df5c440202016a4;p=thirdparty%2Fjinja.git

Merge branch 'adamchainz-master'
---

b1851eb649c4ae463b261d268df5c440202016a4