From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 4 Jul 2013 14:25:55 +0000 (+0200)
Subject: Merge branch '2.7-maintenance'
X-Git-Tag: 2.8~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c7b51bbd0582df50a2400911071ed5109e0c31d;p=thirdparty%2Fjinja.git

Merge branch '2.7-maintenance'
---

4c7b51bbd0582df50a2400911071ed5109e0c31d