]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorDaniel Lowrey <rdlowrey@php.net>
Sat, 15 Feb 2014 01:15:24 +0000 (18:15 -0700)
committerDaniel Lowrey <rdlowrey@php.net>
Sat, 15 Feb 2014 01:15:24 +0000 (18:15 -0700)
commit65adb74984db4d93e57ddc2583e6bceee5bdc7da
tree9b7cfbaa338fc6e32df895009ba366da9fa8aafe
parentf9829690d4f6e747a8d46751c9d37e5e5e40336c
parent19524fc6feb44050bbb70c19717c59864ae4955d
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix for bug66501 - "key type not supported in this PHP build"
ext/openssl/openssl.c