]> git.ipfire.org Git - thirdparty/jinja.git/commit
Merge branch 'adamchainz-master'
authorMarkus Unterwaditzer <markus@unterwaditzer.net>
Wed, 11 Mar 2015 20:26:50 +0000 (21:26 +0100)
committerMarkus Unterwaditzer <markus@unterwaditzer.net>
Wed, 11 Mar 2015 20:26:50 +0000 (21:26 +0100)
commitb1851eb649c4ae463b261d268df5c440202016a4
tree318bdca7fb41fdf0ee9fcae8e29bbb83e5fa8696
parent0b49f13fd16c2f7f43591a687e27c515be62c8a9
parentf1668bd26eba3a3b6616735cfabb5c4bd9de6af2
Merge branch 'adamchainz-master'