commit | 80b4fe6159a31fe3752b659785c0c75ce3af2ef3 | [log] [tgz] |
---|---|---|
author | Armin Ronacher <armin.ronacher@active-4.com> | Thu Dec 15 11:50:59 2011 +0100 |
committer | Armin Ronacher <armin.ronacher@active-4.com> | Thu Dec 15 11:50:59 2011 +0100 |
tree | fc6d727c3ca0a6fbebf47d6e599e9daa56f3dfee | |
parent | 1161915fd7673275f77560ab110963c85cbda676 [diff] | |
parent | 7269991b8c84c85038c528c39c4ee543878013d8 [diff] |
Merge branch 'master' of github.com:mitsuhiko/jinja2