]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Wed, 24 Sep 2014 08:36:58 +0000 (10:36 +0200)
committerRemi Collet <remi@php.net>
Wed, 24 Sep 2014 08:36:58 +0000 (10:36 +0200)
* PHP-5.6:
  NEWS
  Fix bug #68074 Allow to use system cipher list instead of hardcoded value

1  2 
ext/openssl/xp_ssl.c

Simple merge