From: Stanislav Malyshev Date: Tue, 14 Apr 2015 07:49:23 +0000 (-0700) Subject: Merge branch 'PHp-5.4' into PHP-5.5 X-Git-Tag: php-5.5.25RC1~42 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4782ceea8073b16101058636479e00cc4302d07e;p=php Merge branch 'PHp-5.4' into PHP-5.5 * PHp-5.4: fix non-standard C --- 4782ceea8073b16101058636479e00cc4302d07e