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

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

8fea62d44b078fd5590ea66756963d0f0c4f3e56