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

Merge branch 'pr/266'
---

157cce707657f1dc97d4cba74c1d6973e8ce3ad5