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