]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d193569 00e99dc)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Fri, 26 Sep 2014 08:01:39 +0000 (01:01 -0700)
committerStanislav Malyshev <stas@php.net>
Fri, 26 Sep 2014 08:01:39 +0000 (01:01 -0700)
* PHP-5.5:
  fix date
  update NEWS
  Revert xp_ssl.c to the state of 5.4.32 due to regressions


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.