]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorDerick Rethans <github@derickrethans.nl>
Tue, 10 May 2016 19:40:09 +0000 (15:40 -0400)
committerDerick Rethans <github@derickrethans.nl>
Tue, 10 May 2016 19:40:09 +0000 (15:40 -0400)
1  2 
run-tests.php

diff --cc run-tests.php
Simple merge