From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Tue, 12 Apr 2016 19:43:27 +0000 (+0200)
Subject: Merge branch 'snoack-issue-466' into 2.8-maintenance
X-Git-Tag: 2.8.1~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89d05accf9a1a8c64b200dfb2947624da362c4a4;p=thirdparty%2Fjinja.git

Merge branch 'snoack-issue-466' into 2.8-maintenance

Fix #467
Fix #466
---

89d05accf9a1a8c64b200dfb2947624da362c4a4