]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Fri, 21 Nov 2014 09:24:53 +0000 (10:24 +0100)
committerAnatol Belski <ab@php.net>
Fri, 21 Nov 2014 09:24:53 +0000 (10:24 +0100)
commit0581e877a500a77e31a991ee56fd92a0c93ed4cb
tree1e58613e3f39e1e435bef8a8268f70718986cb03
parentb97fd60b424f556eca93f12b2b398e95c7bbc5a0
parentf2e33dc725ebc56a4871ae38e3a36ec96dba21ea
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  added test for things done so far for bug #66265
  partially fixed bug #66265
  forked bug67052.phpt for Windows
ext/standard/basic_functions.c