From: Stanislav Malyshev Date: Wed, 20 Aug 2014 21:44:33 +0000 (-0700) Subject: Merge branch 'PHP-5.5' into PHP-5.6 X-Git-Tag: PRE_64BIT_BRANCH_MERGE~17^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89d3a356d11aab0b1052cbdb036cede278a5eec2;p=php Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: fix test --- 89d3a356d11aab0b1052cbdb036cede278a5eec2