]> git.ipfire.org Git - thirdparty/jinja.git/commit
Merge branch 'pr/266'
authorArmin Ronacher <armin.ronacher@active-4.com>
Thu, 12 Dec 2013 22:26:58 +0000 (22:26 +0000)
committerArmin Ronacher <armin.ronacher@active-4.com>
Thu, 12 Dec 2013 22:26:58 +0000 (22:26 +0000)
commit157cce707657f1dc97d4cba74c1d6973e8ce3ad5
treee3a224d199afb9cc467fa482efc81bdf9d3fdcc5
parent853d8654adf493ce71652ec6f0c4c3d4976f4923
parent1eeaccc94be0c0c3d8ff11cb20c9b8beeeadcde4
Merge branch 'pr/266'