]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorDaniel Lowrey <rdlowrey@php.net>
Thu, 5 Mar 2015 19:24:04 +0000 (12:24 -0700)
committerDaniel Lowrey <rdlowrey@php.net>
Thu, 5 Mar 2015 19:24:04 +0000 (12:24 -0700)
commit927b137c1b6490384080a66a8ba678db3a90f6ba
treea64ac397a44e7c171866ef9477484ea86822ee36
parent7fa10095603ae03f0028041620ffe80375a1c84c
parentc985ec737d8340e941feda05de647cce10b744ea
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix ZTS
  Fix ZTS build

Conflicts:
ext/openssl/openssl.c
ext/openssl/xp_ssl.c
ext/openssl/xp_ssl.c