]> git.ipfire.org Git - thirdparty/jinja.git/commit
Merge branch 'master' of github.com:mitsuhiko/jinja2
authorArmin Ronacher <armin.ronacher@active-4.com>
Sat, 18 May 2013 11:06:06 +0000 (12:06 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sat, 18 May 2013 11:06:06 +0000 (12:06 +0100)
commit587d61b7f8a8a0b4fec100f531f73ab62d9dd121
treec9bbec8eb3abff464fa2db3ce9cb50ef8ccb50d4
parent2b5b35a9f4ac476a397364ffd9317db074e5d011
parent9aa4bddafa1e4b0ccf06cc7ff0c0fd2f1bdd49d0
Merge branch 'master' of github.com:mitsuhiko/jinja2