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

Merge branch '2.7-maintenance'
---

067f0c4e20e98949dbca59599824fa053892c38d