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