]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@php.net>
Mon, 16 Feb 2015 06:18:08 +0000 (14:18 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 16 Feb 2015 06:18:08 +0000 (14:18 +0800)
commit10fe317300b59b3fc8dbce8ea9757e6692a77174
treea544d791df375ea70f2924206a6c0383f363af5e
parent91859f15a8f940ea3a85d66c664eada9c37e6b45
parent830998811112d60a9fe98c7e2b86250ccf75d6f4
Merge branch 'PHP-5.6'

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