Merge branch 'master' of github.com:mitsuhiko/jinja2
authorArmin Ronacher <armin.ronacher@active-4.com>
Thu, 15 Dec 2011 10:50:59 +0000 (11:50 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Thu, 15 Dec 2011 10:50:59 +0000 (11:50 +0100)
commit80b4fe6159a31fe3752b659785c0c75ce3af2ef3
treefc6d727c3ca0a6fbebf47d6e599e9daa56f3dfee
parent1161915fd7673275f77560ab110963c85cbda676
parent7269991b8c84c85038c528c39c4ee543878013d8
Merge branch 'master' of github.com:mitsuhiko/jinja2