]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorDaniel Lowrey <rdlowrey@php.net>
Sat, 15 Feb 2014 01:24:04 +0000 (18:24 -0700)
committerDaniel Lowrey <rdlowrey@php.net>
Sat, 15 Feb 2014 01:24:04 +0000 (18:24 -0700)
commit1b4af87af4d317230eff04c7f6e6ef63927a947a
tree7cea9a29ce8f47eb474117a46c0b95fda4a7d155
parent89292d95ad87bbc275cc86d8686f5b6834d845ad
parentb60cb2b88a0502b1b098544176a1c64a30ef5182
Merge branch 'PHP-5.6'

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