]> granicus.if.org Git - php/commit
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)
commitec89e6bfe2ddd9ed13547d5cb09dbdf3dbbb83b4
tree8ce778a145f65fa7d93843c6197f1802b0a2322e
parent4fe9a5d61132985bbbc5cb0d13de7dc79b44a60f
parent4f115c0b7d35bc6f5c522e2ac426871eabb64832
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fixed EOL in the test