From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Fri, 6 Jun 2014 15:37:47 +0000 (+0600)
Subject: Merge branch 'pr/314'
X-Git-Tag: 2.8~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9895c88f69ea6a4dcb16c78c14f976527cdd119;p=thirdparty%2Fjinja.git

Merge branch 'pr/314'
---

a9895c88f69ea6a4dcb16c78c14f976527cdd119