]> granicus.if.org Git - php/commit
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)
commit3578e5b25008157abd086e52ec1d179566359610
tree35bf577550a099955fa8958e26c53a2cb4cce955
parent1db49d8c5be575a7e364ba2fbd875d714c914fee
parent09f2355eec0b800905d59f9e96ae09d242ba7673
Merge branch 'PHP-5.5' into PHP-5.6

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