]> git.ipfire.org Git - thirdparty/jinja.git/commit
Merge branch 'pgjones-master'
authorMarkus Unterwaditzer <markus@unterwaditzer.net>
Thu, 19 May 2016 18:59:56 +0000 (20:59 +0200)
committerMarkus Unterwaditzer <markus@unterwaditzer.net>
Thu, 19 May 2016 18:59:56 +0000 (20:59 +0200)
commit042dadda53120176100241422f93a42238779d40
treee7d98907776bda86081e8c520952f240ef1a516b
parentb927c9f27115de078f143ea23f6fb25e7ae204cd
parent84e87127b480c2ad1fc770c4443d8d4e607403d7
Merge branch 'pgjones-master'