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

Merge branch '2.9-maintenance'
---

fd7969acd66c82f380d20033028c6e31bb38135c
diff --cc CHANGES
index 1b7b686c,8e5b4ab3..c37c8b00
--- a/CHANGES
+++ b/CHANGES
@@@ -1,17 -1,9 +1,17 @@@
  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.3
  -------------
- (bugfix release, release date to be decided)
+ (bugfix release, released on January 8th 2017)
  
  - Restored the use of blocks in macros to the extend that was possible
    before.  On Python 3 it would render a generator repr instead of