From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Wed, 1 Apr 2015 23:54:08 +0000 (+0200)
Subject: Merge branch '2.7-maintenance'
X-Git-Tag: 2.8~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63018b58258ecca258d639d57fee8b8b4cf36c58;p=thirdparty%2Fjinja.git

Merge branch '2.7-maintenance'
---

63018b58258ecca258d639d57fee8b8b4cf36c58