From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Mon, 25 May 2015 10:25:02 +0000 (+0200)
Subject: Merge branch 'pr/451'
X-Git-Tag: 2.8~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bfb60f831352982ed484a669d28614af6db77a2;p=thirdparty%2Fjinja.git

Merge branch 'pr/451'
---

0bfb60f831352982ed484a669d28614af6db77a2