From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Wed, 7 Aug 2013 15:04:01 +0000 (+0100)
Subject: Merge branch '2.7-maintenance'
X-Git-Tag: 2.8~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63227f05c52fa4518a96e65d37ca0492ac058535;p=thirdparty%2Fjinja.git

Merge branch '2.7-maintenance'
---

63227f05c52fa4518a96e65d37ca0492ac058535