From: Xinchen Hui Date: Tue, 3 Feb 2015 15:01:48 +0000 (+0800) Subject: Merge branch 'master' into resource-api X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~3^2~33^2~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38829b3b4beee0e6bed9b4c6443e86bceaa2d37d;p=php Merge branch 'master' into resource-api --- 38829b3b4beee0e6bed9b4c6443e86bceaa2d37d