]> granicus.if.org Git - php/commitdiff
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)
* PHP-5.4:
  fixed EOL in the test


Trivial merge