From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Fri, 19 Feb 2010 10:10:32 +0000 (+0100)
Subject: merged with 2.3-maintenance
X-Git-Tag: 2.4~28
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8986f47be487eabde1e416834bcc96f3a78ae617;p=jinja2.git

merged with 2.3-maintenance

--HG--
branch : trunk
---

8986f47be487eabde1e416834bcc96f3a78ae617
diff --cc CHANGES
index a630f87,e14bdf0..0491b6c
--- a/CHANGES
+++ b/CHANGES
@@@ -1,15 -1,13 +1,22 @@@
  Jinja2 Changelog
  ================
  
 +Version 2.4
 +-----------
 +(codename to be selected, release date unknown)
 +
 +- the environment template loading functions now transparently
 +  pass through a template object if it was passed to it.  This
 +  makes it possible to import or extend from a template object
 +  that was passed to the template.
 +
+ Version 2.3.1
+ -------------
+ (bugfix release, released on February 19th 2010)
+ 
+ - fixed an error reporting bug on all python versions
+ - fixed an error reporting bug on Python 2.4
+ 
  Version 2.3
  -----------
  (3000 Pythons, released on February 10th 2010)