From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Mon, 1 Jun 2015 15:05:36 +0000 (+0200)
Subject: Merge branch 'merwok-patch-1'
X-Git-Tag: 2.8~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45fe80e8a32fc1c1a04dfbb0d55b2255f438221f;p=thirdparty%2Fjinja.git

Merge branch 'merwok-patch-1'

Fix #455
---

45fe80e8a32fc1c1a04dfbb0d55b2255f438221f