]> git.ipfire.org Git - thirdparty/jinja.git/commit
Merge branch 'pr/314'
authorArmin Ronacher <armin.ronacher@active-4.com>
Fri, 6 Jun 2014 15:37:47 +0000 (21:37 +0600)
committerArmin Ronacher <armin.ronacher@active-4.com>
Fri, 6 Jun 2014 15:37:47 +0000 (21:37 +0600)
commita9895c88f69ea6a4dcb16c78c14f976527cdd119
tree36b4d2bb0f265cf0fc1c7b81679c9969edd830a3
parentdd11bcd732fa55a75e9b5634dcb0b9405718c989
parent48196fb4f84a7a3ad2a3c54691e66d071b564175
Merge branch 'pr/314'