projects / jinja2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44e1f56 da8d68f)
Merge branch '2.5-maintenance'
authorArmin Ronacher <armin.ronacher@active-4.com>
Sun, 17 Oct 2010 14:47:13 +0000 (16:47 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sun, 17 Oct 2010 14:47:13 +0000 (16:47 +0200)
1  2 
CHANGES patch | diff1 | diff2 | blob | history

diff --cc CHANGES
Simple merge
The Jinja2 template engine, with 2to3 already run