]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorPierrick Charron <pierrick@php.net>
Fri, 21 Dec 2012 16:49:00 +0000 (11:49 -0500)
committerPierrick Charron <pierrick@php.net>
Fri, 21 Dec 2012 16:49:00 +0000 (11:49 -0500)
commit9d235eadc86b5cd730d2e4d683262c20f34aaa4e
tree6055c342f091c46b09b4e25957ead7094f7672ce
parent14f133036cfa6c2ab3f5eb9af3a0c0b29ed5d554
parent763bce0303b3afd19d109d96c37d6d33a899e990
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix test