From: Daniel Lowrey Date: Thu, 5 Mar 2015 21:11:35 +0000 (-0700) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~795 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=39501bed3b8883d056834a3bb4de8ee66675889f;p=php Merge branch 'PHP-5.6' * PHP-5.6: Really fix zts this time Conflicts: ext/openssl/xp_ssl.c --- 39501bed3b8883d056834a3bb4de8ee66675889f