]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Thu, 9 Jan 2014 14:28:47 +0000 (15:28 +0100)
committerAnatol Belski <ab@php.net>
Thu, 9 Jan 2014 14:28:47 +0000 (15:28 +0100)
* PHP-5.5:
  fixed EOL in the test


Trivial merge