From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sun, 7 Oct 2007 16:54:45 +0000 (+0200)
Subject: merged
X-Git-Tag: 2.0rc1~263
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46d9bebc25bb312fcb0717e24bb7dbf3a4beed04;p=thirdparty%2Fjinja.git

merged

--HG--
branch : trunk
---

46d9bebc25bb312fcb0717e24bb7dbf3a4beed04