From: Stanislav Malyshev Date: Thu, 5 Feb 2015 08:41:55 +0000 (-0800) Subject: Merge branch 'PHP-5.5' into PHP-5.6 X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~3^2~5^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c386b55f2f967e7846019c4dd4660e7c7807c0b;p=php Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: fix test to not hit php.net --- 2c386b55f2f967e7846019c4dd4660e7c7807c0b