From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sun, 8 Jan 2017 22:40:52 +0000 (+0100)
Subject: Merge branch '2.9-maintenance'
X-Git-Tag: 2.10~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d66b81b73c5e963b4c9aecbe35ae1b1fbeadf1d9;p=thirdparty%2Fjinja.git

Merge branch '2.9-maintenance'
---

d66b81b73c5e963b4c9aecbe35ae1b1fbeadf1d9
diff --cc CHANGES
index c37c8b00,4d8fabb1..69475061
--- a/CHANGES
+++ b/CHANGES
@@@ -1,14 -1,12 +1,20 @@@
  Jinja2 Changelog
  ================
  
 +Version 2.10
 +------------
 +(feature release, release date to be decided)
 +
 +- Added a new extension node called `OverlayScope` which can be used to
 +  create an unoptimized scope that will look up all variables from a
 +  derived context.
 +
+ Version 2.9.4
+ -------------
+ (unreleased bugfix release)
+ 
+ - Solved some warnings for string literals.  (#646)
+ 
  Version 2.9.3
  -------------
  (bugfix release, released on January 8th 2017)