From: Xinchen Hui Date: Wed, 25 Feb 2015 12:49:51 +0000 (+0800) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~68 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=156e7881b8cad4c8fe773a2721330832bd07e767;p=php Merge branch 'PHP-5.6' --- 156e7881b8cad4c8fe773a2721330832bd07e767