]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db1a668 ca24d19)
Merge branch 'PHP-5.6'
authorDaniel Lowrey <rdlowrey@php.net>
Thu, 5 Mar 2015 21:11:35 +0000 (14:11 -0700)
committerDaniel Lowrey <rdlowrey@php.net>
Thu, 5 Mar 2015 21:11:35 +0000 (14:11 -0700)
* PHP-5.6:
  Really fix zts this time

Conflicts:
ext/openssl/xp_ssl.c


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