From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 29 Dec 2016 13:15:27 +0000 (+0100)
Subject: Merge branch '2.8-maintenance' of github.com:pallets/jinja into 2.8-maintenance
X-Git-Tag: 2.8.1~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a010f5fd33c411cb74395c89f8cc69c2283a96cc;p=thirdparty%2Fjinja.git

Merge branch '2.8-maintenance' of github.com:pallets/jinja into 2.8-maintenance
---

a010f5fd33c411cb74395c89f8cc69c2283a96cc
diff --cc CHANGES
index e3e75820,51ce60aa..29a773b9
--- a/CHANGES
+++ b/CHANGES
@@@ -4,12 -4,10 +4,13 @@@ Jinja2 Changelo
  Version 2.8.1
  -------------
  
 -(unreleased bugfix release)
 +(bugfix release, released on December 29th 2016)
  
  - Fixed the `for_qs` flag for `urlencode`.
+ - Fixed regression when applying `int` to non-string values.
 +- SECURITY: if the sandbox mode is used format expressions are now sandboxed
 +  with the same rules as in Jinja.  This solves various information leakage
 +  problems that can occur with format strings.
  
  Version 2.8
  -----------