| commit | dc4b4cd03495306f2ab75c3ca13a626822bb822d | [log] [tgz] |
|---|---|---|
| author | Armin Ronacher <armin.ronacher@active-4.com> | Sun May 19 11:37:01 2013 +0100 |
| committer | Armin Ronacher <armin.ronacher@active-4.com> | Sun May 19 11:37:01 2013 +0100 |
| tree | 7a67d68d0b54c10bc59dc4d173db78376bc26280 | |
| parent | 4b2c926d9d9f6039502a5b53f448a182807d67a2 [diff] | |
| parent | d6892c583ba0c121c0b8cda7c8874e9876f992f3 [diff] |
Merge branch 'master' of github.com:mitsuhiko/jinja2