]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Fri, 26 Sep 2014 08:00:20 +0000 (01:00 -0700)
committerStanislav Malyshev <stas@php.net>
Fri, 26 Sep 2014 08:00:20 +0000 (01:00 -0700)
commit00e99dcafd4aa07db61f937f2c4c23a6a717c941
treea46cd50bb5166787bd9e99b225a8af4b2f2a09ec
parent2bfe92c90f182d9618b616208ce650cff66e364d
parent28ed0119acf4cdd15653012b1b4f1a8668e97126
Merge branch 'PHP-5.4' into PHP-5.5

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

Conflicts:
ext/openssl/xp_ssl.c