From: Ferenc Kovacs Date: Fri, 27 Jun 2014 14:30:30 +0000 (+0200) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHPNG_MERGE~154 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6dc56dd8e8cc8d66c60915d8a53f6d3e48b1f863;p=php Merge branch 'PHP-5.6' * PHP-5.6: removing the format added by mistake, props to Solar Designer for spotting this. --- 6dc56dd8e8cc8d66c60915d8a53f6d3e48b1f863