]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Fri, 14 Mar 2014 08:52:02 +0000 (09:52 +0100)
committerRemi Collet <remi@php.net>
Fri, 14 Mar 2014 08:52:02 +0000 (09:52 +0100)
* PHP-5.4:
  NEWS
  Fixed Bug #66833 Default digest algo is still MD5

1  2 
ext/openssl/openssl.c

Simple merge