]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorGeorge Wang <gwang@php.net>
Mon, 29 Aug 2016 02:23:28 +0000 (22:23 -0400)
committerGeorge Wang <gwang@php.net>
Mon, 29 Aug 2016 02:23:28 +0000 (22:23 -0400)
commitca1eb585ee0ef7d2ab5bb4160aa0a36f59d51a48
tree9247a49e670b787134cccc8e3f36b09a0c483026
parent986d0f87ec873c88dedbac334fa5896c068ed987
parentc73bcbefbd74c650b48caef7e475502c1ef96c90
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
sapi/litespeed/lsapi_main.c
sapi/litespeed/lsapi_main.c