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

Merge branch '2.7-maintenance'
---

d65f40f90c305e1006f3b3144accfbc22670a542