]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Thu, 5 Jun 2014 12:00:29 +0000 (14:00 +0200)
committerRemi Collet <remi@php.net>
Thu, 5 Jun 2014 12:00:29 +0000 (14:00 +0200)
commit218df7e058b89f43481a4e5b2f180ca5fbeeb5fe
tree8ac8ae57f63a4c818f2196d7a2b1ad700fdea531
parentce22c03a72db57ab6d739b444e35359e8f358879
parentab848ea400d4a3536aeb0b281b51abc239264595
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  add test for previous fix