]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 10d14f2 63227f0)
Merge branch 'master' into tox_posargs 239/head
authorMarc Abramowitz <marc@marc-abramowitz.com>
Wed, 16 Oct 2013 23:52:43 +0000 (16:52 -0700)
committerMarc Abramowitz <marc@marc-abramowitz.com>
Wed, 16 Oct 2013 23:52:43 +0000 (16:52 -0700)

Trivial merge
Mirror of https://github.com/pallets/jinja.git