From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sat, 18 May 2013 11:04:19 +0000 (+0100)
Subject: Merge branch 'master' into sprint-branch
X-Git-Tag: 2.7~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=064ccaf7e30d191d96123b1555969499cc4b86b0;p=thirdparty%2Fjinja.git

Merge branch 'master' into sprint-branch
---

064ccaf7e30d191d96123b1555969499cc4b86b0