From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Wed, 16 Oct 2013 23:52:43 +0000 (-0700)
Subject: Merge branch 'master' into tox_posargs
X-Git-Tag: 2.8~50^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d24e0c6d231d6a5a6370556409fdd2627364ff8;p=thirdparty%2Fjinja.git

Merge branch 'master' into tox_posargs
---

8d24e0c6d231d6a5a6370556409fdd2627364ff8