]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorWill Fitch <willfitch@php.net>
Sat, 18 Jan 2014 16:56:22 +0000 (11:56 -0500)
committerWill Fitch <willfitch@php.net>
Sat, 18 Jan 2014 16:56:22 +0000 (11:56 -0500)
commita540c5733113ed08f63244492c6a3be847916805
tree4c3adca9032e641e9d661f476dc07f14fe9846bc
parent31a2ac470cba47a396a9b6c815700fbec51c6032
parent767e6d2e08afad2ac5e019b08a8875ffd2496206
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #66509: copy() arginfo incorrect since 5.4
ext/standard/basic_functions.c