From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Wed, 11 Mar 2015 20:12:56 +0000 (+0100)
Subject: Merge branch 'westurner-patch-1'
X-Git-Tag: 2.8~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f3a09b913aad10ead81c0f7c6f1bca13ba0ae7e;p=thirdparty%2Fjinja.git

Merge branch 'westurner-patch-1'
---

1f3a09b913aad10ead81c0f7c6f1bca13ba0ae7e