diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-09-26 01:00:20 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-09-26 01:00:20 -0700 |
| commit | 00e99dcafd4aa07db61f937f2c4c23a6a717c941 (patch) | |
| tree | a46cd50bb5166787bd9e99b225a8af4b2f2a09ec | |
| parent | 2bfe92c90f182d9618b616208ce650cff66e364d (diff) | |
| parent | 28ed0119acf4cdd15653012b1b4f1a8668e97126 (diff) | |
| download | php-git-00e99dcafd4aa07db61f937f2c4c23a6a717c941.tar.gz | |
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
0 files changed, 0 insertions, 0 deletions