]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Mon, 24 Nov 2014 15:25:38 +0000 (16:25 +0100)
committerAnatol Belski <ab@php.net>
Mon, 24 Nov 2014 15:25:38 +0000 (16:25 +0100)
* PHP-5.5:
  fix dir separator in test
  fork test for windows
  update for LiteSpeed


Trivial merge