]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorXinchen Hui <laruence@gmail.com>
Sun, 19 Jun 2016 04:33:54 +0000 (21:33 -0700)
committerXinchen Hui <laruence@gmail.com>
Sun, 19 Jun 2016 04:33:54 +0000 (21:33 -0700)
commit6b83832cf48ec42008b262ace9742fe820d322cd
tree9de43b93477a3bd74e435a71731e450498d72839
parentcc64702796ce323840eae5ec7a286788d6b4979c
parentc4c1993af63fe4c0d19d44ebbd38996471c141af
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
main/streams/xp_socket.c
main/streams/xp_socket.c