]> git.ipfire.org Git - thirdparty/jinja.git/commit
Merge branch '2.7-maintenance'
authorArmin Ronacher <armin.ronacher@active-4.com>
Wed, 7 Aug 2013 11:31:17 +0000 (12:31 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Wed, 7 Aug 2013 11:31:17 +0000 (12:31 +0100)
commitd65f40f90c305e1006f3b3144accfbc22670a542
tree3353b0adc4be508b14bc95216abb2d462a0cd376
parent4c7b51bbd0582df50a2400911071ed5109e0c31d
parent3d82fc3d14d64206d0a073c3a1641f83fac4a1ce
Merge branch '2.7-maintenance'