From: Anatol Belski <ab@php.net>
Date: Mon, 24 Nov 2014 15:25:38 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.4RC1~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3578e5b25008157abd086e52ec1d179566359610;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix dir separator in test
  fork test for windows
  update for LiteSpeed
---

3578e5b25008157abd086e52ec1d179566359610