From: Felipe Pena Date: Mon, 16 Feb 2015 15:09:52 +0000 (-0200) Subject: Merge branch 'PHP-5.5' into PHP-5.6 X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~131^2~4 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=abbc82f4481f236521b0426d0956f6037dd3cbf4;p=php Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: - Fix merge BFN --- abbc82f4481f236521b0426d0956f6037dd3cbf4