]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Thu, 10 Jan 2013 10:18:25 +0000 (11:18 +0100)
committerRemi Collet <remi@php.net>
Thu, 10 Jan 2013 10:18:25 +0000 (11:18 +0100)
commitb3a934bdb317845c56247b55db4212ffc4171942
treeee63e175449bbf354c79434f61ccc2efa3779100
parent846e506a3d1d11773171e08d3c6f9bbc7fc3dacd
parentf659ec108f2a3a8278300e6f110545e219f2a1b7
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) See commit c05ee74e7ff28b49018bf3e8f452bfd5386d1b68