]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Thu, 9 Jan 2014 14:28:09 +0000 (15:28 +0100)
committerAnatol Belski <ab@php.net>
Thu, 9 Jan 2014 14:28:09 +0000 (15:28 +0100)
commit4f115c0b7d35bc6f5c522e2ac426871eabb64832
treebad32a8c0d7f7521bce5ee2ad1a7b064b5c8d17a
parent418602adfb360f6bc43acd56fb6436633fc5fa62
parentb8774519e25f97bfcb40b365dee17e7492875074
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed EOL in the test