]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Thu, 5 Jun 2014 15:34:32 +0000 (17:34 +0200)
committerRemi Collet <remi@php.net>
Thu, 5 Jun 2014 15:34:32 +0000 (17:34 +0200)
commitb16950b5d32df8cc885f5b46c752ddf5c4f48c0d
tree492705e3fcc2d5d681a3f422fefa22be30e90925
parent218df7e058b89f43481a4e5b2f180ca5fbeeb5fe
parent67f1a58ac9cc42b3bcd077aad246d300b07a7010
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test for 5.4/5.5