From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Fri, 19 Feb 2010 12:40:23 +0000 (+0100)
Subject: Merged in 2.3.1 release fixes
X-Git-Tag: 2.4~27
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d72105faed82e4fcfb5443fa061dcd92e5ca4986;p=jinja2.git

Merged in 2.3.1 release fixes

--HG--
branch : trunk
---

d72105faed82e4fcfb5443fa061dcd92e5ca4986
diff --cc .hgtags
index 08f9c07,1227d1a..b2baf6c
--- a/.hgtags
+++ b/.hgtags
@@@ -4,5 -4,4 +4,5 @@@ bac88fe8bc0e50b321a04eea038ed4542c43a62
  ac0fc30f7b5ffca59769c5d9ed78f50596868af8 2.1.1
  45970e0ca3a809e098680cd1786158a6b1a48dba 2.2
  58325d0cdee32fe11c7768326b827df0610cb067 2.2.1
 +3d793a1f6346f0ae7059153f2d4d64c872e43050 2.3
- cc4a105b7c0c6b9408431a59f68e85ac7241e082 2.3.1
+ 29a2aa20b611870ed5efcd54630741e1b3629040 2.3.1