projects / jinja2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f55b1a4 3dd4155)
Merge branch '2.5-maintenance'
authorArmin Ronacher <armin.ronacher@active-4.com>
Sun, 17 Oct 2010 14:02:23 +0000 (16:02 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sun, 17 Oct 2010 14:02:23 +0000 (16:02 +0200)

Trivial merge
The Jinja2 template engine, with 2to3 already run