From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sun, 19 May 2013 11:45:48 +0000 (+0100)
Subject: Merge remote-tracking branch 'apollo13/master'
X-Git-Tag: 2.7~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9417d013111e8e7ab1276e0ce5c271d24e002c4b;p=thirdparty%2Fjinja.git

Merge remote-tracking branch 'apollo13/master'
---

9417d013111e8e7ab1276e0ce5c271d24e002c4b