From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Sun, 22 Mar 2015 12:48:17 +0000 (+0100)
Subject: Merge branch 'lkarthee-pytest_migration'
X-Git-Tag: 2.8~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c5f1e8d85bdb2e0157685a61d3c9dda41108a7c;p=thirdparty%2Fjinja.git

Merge branch 'lkarthee-pytest_migration'
---

1c5f1e8d85bdb2e0157685a61d3c9dda41108a7c