commit | 8dc9d4d6cb6bbfd3bee9d32cc25fb294dc60cd78 | [log] [tgz] |
---|---|---|
author | Armin Ronacher <armin.ronacher@active-4.com> | Sun May 19 11:18:59 2013 +0100 |
committer | Armin Ronacher <armin.ronacher@active-4.com> | Sun May 19 11:18:59 2013 +0100 |
tree | fabb1748f41f6c90ece8e02c2f8b24275d5e4c3b | |
parent | a65f1eb9065d78fcd0b4871782bbe008b5f8ab7b [diff] | |
parent | 83f6a6891212b4a169346b1454801e296dc7cd66 [diff] |
Merge branch 'master' of github.com:mitsuhiko/jinja2