From: Anatol Belski Date: Fri, 13 Feb 2015 12:40:10 +0000 (+0100) Subject: Merge branch 'PHP-5.5' into PHP-5.6 X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~159^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3d28d14d6cec9b3968dda5da41feb02d5b1b069;p=php Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: fix condition --- b3d28d14d6cec9b3968dda5da41feb02d5b1b069