From: Stanislav Malyshev <stas@php.net>
Date: Fri, 26 Sep 2014 08:01:39 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.4RC1~59^2~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b465f00d42dbe170e9eb905fe1dcbdbf4ce1f945;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix date
  update NEWS
  Revert xp_ssl.c to the state of 5.4.32 due to regressions
---

b465f00d42dbe170e9eb905fe1dcbdbf4ce1f945