merged with 2.3-maintenance

--HG--
branch : trunk

diff --cc CHANGES
index a630f87aed4d92a3067221493ca7d8e304e114d4,e14bdf05a319a7d2289cf2639c5d2ffbbf6cacd4..0491b6c7af5ad1e479e3507ecc8d8b33abcad3fe
--- 1/CHANGES
--- 2/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)