]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAdam Harvey <aharvey@php.net>
Fri, 23 May 2014 15:23:15 +0000 (15:23 +0000)
committerAdam Harvey <aharvey@php.net>
Fri, 23 May 2014 15:23:15 +0000 (15:23 +0000)
commit80a2716b56b0eabae018108605ce3ecfecd5ce3c
tree5ffdf65fd47ecee459e098c9fc95934ba3cd45ac
parent34900eb2896d1e80a8be46199dd601059ee1e868
parent2260fca3ddac419de18319eb4fdd36183b83ff7b
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Further test fixes for the fdb2709 breakage.
  Fix broken test caused by fdb2709.