]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 64162cd 27f5957)
Merge branch 'PHP-5.6'
authorDaniel Lowrey <rdlowrey@php.net>
Wed, 7 May 2014 14:13:31 +0000 (08:13 -0600)
committerDaniel Lowrey <rdlowrey@php.net>
Wed, 7 May 2014 14:13:31 +0000 (08:13 -0600)
* PHP-5.6:
  Allow crypto_method context value in stream_socket_enable_crypto()


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.