]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 846e506 f659ec1)
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)
* PHP-5.4:
  Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) See commit c05ee74e7ff28b49018bf3e8f452bfd5386d1b68


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.