Skip to content

Commit 00e99dc

Browse files
committed
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
2 parents 2bfe92c + 28ed011 commit 00e99dc

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)