]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Thu, 5 Jun 2014 15:34:09 +0000 (17:34 +0200)
committerRemi Collet <remi@php.net>
Thu, 5 Jun 2014 15:34:09 +0000 (17:34 +0200)
commit67f1a58ac9cc42b3bcd077aad246d300b07a7010
tree8d7a7d4cd6183512a5b37daa273d065ed65ab462
parentab848ea400d4a3536aeb0b281b51abc239264595
parent127651e9aeb4294c6be8c450fc1e7344570045f3
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix test for 5.4/5.5