From: Adam Harvey Date: Fri, 2 May 2014 17:26:18 +0000 (-0700) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHPNG_MERGE~318 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=62d72d91058d9d0b2885c611dfb99c3182183273;p=php Merge branch 'PHP-5.6' * PHP-5.6: Fix author name on the #63228 patch. --- 62d72d91058d9d0b2885c611dfb99c3182183273