From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 12 Dec 2013 22:27:53 +0000 (+0000)
Subject: Merge branch 'pr/267'
X-Git-Tag: 2.8~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=daf34166bebbe5734101dfc44fb62828af1d0452;p=thirdparty%2Fjinja.git

Merge branch 'pr/267'
---

daf34166bebbe5734101dfc44fb62828af1d0452