]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8dd99dd 633f898)
Merge branch 'PHP-5.4' into PHP-5.5
authorDaniel Lowrey <rdlowrey@php.net>
Wed, 19 Feb 2014 11:01:08 +0000 (04:01 -0700)
committerDaniel Lowrey <rdlowrey@php.net>
Wed, 19 Feb 2014 11:01:08 +0000 (04:01 -0700)
commita7d36066507b8d43c4a63bb60ba3ec1de3b68aaf
tree068ea65c4deabd1c4f033402c0cef6f870cad5fbtree | snapshot
parent8dd99dd2dc748b323f18619fa7bfa940e8d4dd9acommit | diff
parent633f898f1520253d3530fe91fc82f68bca7c4627commit | diff
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Skip failing tests when EC unavailable (RHEL)

Conflicts:
ext/openssl/openssl.c
ext/openssl/openssl.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.