From: David Lord Date: Wed, 5 Apr 2017 14:26:08 +0000 (-0700) Subject: Merge pull request #700 from brunodoamaral/patch-1 X-Git-Tag: 2.10~30 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=43f86e4f6feecde9b891b4b465359d8153f60630;p=thirdparty%2Fjinja.git Merge pull request #700 from brunodoamaral/patch-1 Fixed incorrect merge in setup.py --- 43f86e4f6feecde9b891b4b465359d8153f60630