From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Tue, 25 Mar 2008 13:36:26 +0000 (+0100)
Subject: merged
X-Git-Tag: 2.0rc1~219
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61a3d3145684a01c28ededb9312a7c921f870772;p=thirdparty%2Fjinja.git

merged

--HG--
branch : trunk
---

61a3d3145684a01c28ededb9312a7c921f870772