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

Merge branch 'pr/283'
---

510fb489d63ad69c5a0cc9057926a0ed3f03f4c3