Merge branch 'PHP-5.3' into PHP-5.4
authorRemi Collet <remi@php.net>
Thu, 10 Jan 2013 10:17:53 +0000 (11:17 +0100)
committerRemi Collet <remi@php.net>
Thu, 10 Jan 2013 10:17:53 +0000 (11:17 +0100)
commitf659ec108f2a3a8278300e6f110545e219f2a1b7
tree18f6f80a58dc54daf5ceb65e6893d124a5db609a
parentd430b5a4eb26679a6dfa7055dff43cae8dabd20e
parentdc9f0e70b78b5ea998f319c63fb181eb4f5bda41
Merge branch 'PHP-5.3' into PHP-5.4

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