From: Stanislav Malyshev Date: Tue, 14 Oct 2014 18:45:01 +0000 (-0700) Subject: Merge branch 'PHP-5.6' X-Git-Tag: POST_NATIVE_TLS_MERGE^2~73^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01d17228dc62ea30b7ad25835f049ccd1998b5f2;p=php Merge branch 'PHP-5.6' * PHP-5.6: Fix return code (merges are hard :( ) --- 01d17228dc62ea30b7ad25835f049ccd1998b5f2