]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAdam Harvey <aharvey@php.net>
Thu, 22 May 2014 22:37:47 +0000 (22:37 +0000)
committerAdam Harvey <aharvey@php.net>
Thu, 22 May 2014 22:37:47 +0000 (22:37 +0000)
commite5e6ba093fd55e75554e549ed40ebbc75a8cf063
tree56432f74715bc605574a52bd5329437215736637
parentd39377924ce0e8cce76a1192ecfb89a48c291e21
parent5d1bfd6fbfbb1474b23b0b58ef81f8396b361fca
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix run-tests.php with Valgrind >= 3.10.0.

Conflicts:
run-tests.php
run-tests.php