From: Remi Collet <remi@php.net>
Date: Thu, 10 Jan 2013 10:18:25 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha4~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3a934bdb317845c56247b55db4212ffc4171942;p=php

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
---

b3a934bdb317845c56247b55db4212ffc4171942