From: Stanislav Malyshev Date: Fri, 26 Sep 2014 08:02:38 +0000 (-0700) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_NATIVE_TLS_MERGE~158^2~28 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c09b1b9b88113e45d34e503c6e76bb528a45ab10;p=php Merge branch 'PHP-5.6' * PHP-5.6: fix date update NEWS Revert xp_ssl.c to the state of 5.4.32 due to regressions --- c09b1b9b88113e45d34e503c6e76bb528a45ab10