From: Xinchen Hui <laruence@php.net>
Date: Fri, 13 Feb 2015 10:27:10 +0000 (+0800)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~160
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=627a2137617712696137a3b1791b5eeb25a56302;p=php

Merge branch 'master' of https://git.php.net/repository/php-src
---

627a2137617712696137a3b1791b5eeb25a56302