]> granicus.if.org Git - php/commit
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)
commit39501bed3b8883d056834a3bb4de8ee66675889f
treea64ac397a44e7c171866ef9477484ea86822ee36
parentdb1a668d629a17a004709ce4b67125451d117d9a
parentca24d19a895e7b8047db7f43acb041ad288a578f
Merge branch 'PHP-5.6'

* PHP-5.6:
  Really fix zts this time

Conflicts:
ext/openssl/xp_ssl.c