From: Benjamin Wiegand <highwaychile@bluevaria.de>
Date: Mon, 9 Jun 2008 17:09:39 +0000 (+0200)
Subject: Automated merge with http://dev.pocoo.org/hg/jinja2-main
X-Git-Tag: 2.0~23^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abfe3fb9e71a40027ec64e3f3907b6f696d76a56;p=thirdparty%2Fjinja.git

Automated merge with http://dev.pocoo.org/hg/jinja2-main

--HG--
branch : trunk
---

abfe3fb9e71a40027ec64e3f3907b6f696d76a56