From: Michael Wallner Date: Wed, 18 Feb 2015 13:05:10 +0000 (+0100) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~121 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=84fad268d0037cf0a2c317048a4594a0065ca27f;p=php Merge branch 'PHP-5.6' * PHP-5.6: fix test --- 84fad268d0037cf0a2c317048a4594a0065ca27f