From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 18 Feb 2010 23:01:18 +0000 (+0100)
Subject: Merged 2.3.1 in
X-Git-Tag: 2.4~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9722bf722e804b38600ba0044a3009097bd26bd2;p=thirdparty%2Fjinja.git

Merged 2.3.1 in

--HG--
branch : trunk
---

9722bf722e804b38600ba0044a3009097bd26bd2
diff --cc .hgtags
index 26e90385,0a6bcdad..08f9c07f
--- a/.hgtags
+++ b/.hgtags
@@@ -4,4 -4,4 +4,5 @@@ bac88fe8bc0e50b321a04eea038ed4542c43a62
  ac0fc30f7b5ffca59769c5d9ed78f50596868af8 2.1.1
  45970e0ca3a809e098680cd1786158a6b1a48dba 2.2
  58325d0cdee32fe11c7768326b827df0610cb067 2.2.1
 +3d793a1f6346f0ae7059153f2d4d64c872e43050 2.3
+ cc4a105b7c0c6b9408431a59f68e85ac7241e082 2.3.1