]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Mon, 13 Jan 2014 16:12:53 +0000 (17:12 +0100)
committerAnatol Belski <ab@php.net>
Mon, 13 Jan 2014 16:12:53 +0000 (17:12 +0100)
* PHP-5.5:
  forked test for win32


Trivial merge