]> git.ipfire.org Git - thirdparty/jinja.git/commit
Merge branch 'master' of github.com:mitsuhiko/jinja2
authorArmin Ronacher <armin.ronacher@active-4.com>
Sun, 19 May 2013 10:37:01 +0000 (11:37 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sun, 19 May 2013 10:37:01 +0000 (11:37 +0100)
commitdc4b4cd03495306f2ab75c3ca13a626822bb822d
tree7a67d68d0b54c10bc59dc4d173db78376bc26280
parent4b2c926d9d9f6039502a5b53f448a182807d67a2
parentd6892c583ba0c121c0b8cda7c8874e9876f992f3
Merge branch 'master' of github.com:mitsuhiko/jinja2