]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorDaniel Lowrey <rdlowrey@php.net>
Tue, 18 Feb 2014 00:38:30 +0000 (19:38 -0500)
committerDaniel Lowrey <rdlowrey@php.net>
Tue, 18 Feb 2014 00:38:30 +0000 (19:38 -0500)
commitbd9aa181dc903a886ac76c45b11bf218948ee31b
tree99a57aa0dde48be67cbe739860dc7c3e455446ab
parent66f76ec1f9bfd57d4c64b4c721c1452cc4f97604
parenta80cec1190e18cf8f23a7786de59e76e7f9fa022
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed broken build when EC unavailable
ext/openssl/openssl.c