]> granicus.if.org Git - php/commitdiff
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)
* PHP-5.4:
  Fix for bug66501 - "key type not supported in this PHP build"

1  2 
ext/openssl/openssl.c

Simple merge