From: Adam Harvey Date: Fri, 5 Dec 2014 21:58:48 +0000 (-0800) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_NATIVE_TLS_MERGE~51 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=751aa92fe5a30ab7b97e3a0df097f61876dacd5d;p=php Merge branch 'PHP-5.6' * PHP-5.6: Revert unintentional docblock change --- 751aa92fe5a30ab7b97e3a0df097f61876dacd5d