From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sun, 26 Jul 2009 08:35:04 +0000 (+0200)
Subject: merged.
X-Git-Tag: 2.2~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3b336c88f8cbe60f84a28f55085f833fb7d0d72c;p=jinja2.git

merged.

--HG--
branch : trunk
---

3b336c88f8cbe60f84a28f55085f833fb7d0d72c
diff --cc CHANGES
index b8450fc,1701f61..380a7c3
--- a/CHANGES
+++ b/CHANGES
@@@ -20,7 -20,9 +20,10 @@@ Version 2.
    *before* the loop.  (#331)
  - Added support for optional `scoped` modifier to blocks.
  - Added support for line-comments.
 +- Added the `meta` module.
+ - Renamed (undocumented) attribute overlay to overlayed on the environment
+   because it was clashing with a method of the same name.  The new attribute
+   is called "overlayed".
  
  Version 2.1.1
  -------------