From: Felipe Pena Date: Mon, 16 Feb 2015 14:22:17 +0000 (-0200) Subject: Merge branch 'master' of git.php.net:/php-src X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~141 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e913a52517aa0d0d08dde5e1d0258c510fc28c6;p=php Merge branch 'master' of git.php.net:/php-src --- 2e913a52517aa0d0d08dde5e1d0258c510fc28c6