]> git.ipfire.org Git - thirdparty/jinja.git/commit
Merge branch 'westurner-patch-1'
authorMarkus Unterwaditzer <markus@unterwaditzer.net>
Wed, 11 Mar 2015 20:12:56 +0000 (21:12 +0100)
committerMarkus Unterwaditzer <markus@unterwaditzer.net>
Wed, 11 Mar 2015 20:12:56 +0000 (21:12 +0100)
commit1f3a09b913aad10ead81c0f7c6f1bca13ba0ae7e
tree01d5fa804ca0cc5e8f8e0bba5b5c550edd01a1e3
parentcdeaa33d0f049641b2b0af108593449842a8d238
parent0ce1bca4a770e36dfe19ebe5fba5da8015b902c4
Merge branch 'westurner-patch-1'