]> git.ipfire.org Git - thirdparty/jinja.git/commit
Merge branch 'pr/283'
authorArmin Ronacher <armin.ronacher@active-4.com>
Thu, 12 Dec 2013 22:29:46 +0000 (22:29 +0000)
committerArmin Ronacher <armin.ronacher@active-4.com>
Thu, 12 Dec 2013 22:29:46 +0000 (22:29 +0000)
commit510fb489d63ad69c5a0cc9057926a0ed3f03f4c3
treebc4f103818bf766a51ac395669766ff9610d056d
parentd47b4d7deed449176139de587297409e45f00d0f
parent40367c48bb6b6354efb09ea2a92ec4e5bbe89559
Merge branch 'pr/283'