projects / jinja2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c97352 accd062)
Merge pull request #36 from afandian/patch-1
authorArmin Ronacher <armin.ronacher@active-4.com>
Thu, 19 May 2011 12:01:53 +0000 (05:01 -0700)
committerArmin Ronacher <armin.ronacher@active-4.com>
Thu, 19 May 2011 12:01:53 +0000 (05:01 -0700)
Kampala is the capital of Uganda!


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