| commit | 587d61b7f8a8a0b4fec100f531f73ab62d9dd121 | [log] [tgz] |
|---|---|---|
| author | Armin Ronacher <armin.ronacher@active-4.com> | Sat May 18 12:06:06 2013 +0100 |
| committer | Armin Ronacher <armin.ronacher@active-4.com> | Sat May 18 12:06:06 2013 +0100 |
| tree | c9bbec8eb3abff464fa2db3ce9cb50ef8ccb50d4 | |
| parent | 2b5b35a9f4ac476a397364ffd9317db074e5d011 [diff] | |
| parent | 9aa4bddafa1e4b0ccf06cc7ff0c0fd2f1bdd49d0 [diff] |
Merge branch 'master' of github.com:mitsuhiko/jinja2