From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Fri, 10 Jan 2014 10:43:55 +0000 (+0000)
Subject: Merge branch '2.7-maintenance'
X-Git-Tag: 2.8~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27ffd01f95cad7740497a32b22e4ef9d29762162;p=thirdparty%2Fjinja.git

Merge branch '2.7-maintenance'
---

27ffd01f95cad7740497a32b22e4ef9d29762162
diff --cc CHANGES
index 179bbd62,d663e7a9..459fde74
--- a/CHANGES
+++ b/CHANGES
@@@ -1,18 -1,9 +1,18 @@@
  Jinja2 Changelog
  ================
  
 +Version 2.8
 +-----------
 +(codename Translation, release date to be decided)
 +
 +- Added `target` parameter to urlize function.
 +- Added support for `followsymlinks` to the file system loader.
 +- The truncate filter now counts the length.
 +- Added equalto filter that helps with select filters.
 +
  Version 2.7.2
  -------------
- (bugfix release, release date to be decided)
+ (bugfix release, released on January 10th 2014)
  
  - Prefix loader was not forwarding the locals properly to
    inner loaders.  This is now fixed.