From: Anatol Belski <ab@php.net>
Date: Thu, 12 Feb 2015 19:30:48 +0000 (+0100)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~173
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a0d472e1dad4a1cb719ba56a1ca4da19fadfdfb3;p=php

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

a0d472e1dad4a1cb719ba56a1ca4da19fadfdfb3