Merge ../phpdbg into PHP-5.6
authorBob Weinand <bobwei9@hotmail.com>
Tue, 28 Oct 2014 21:15:05 +0000 (22:15 +0100)
committerBob Weinand <bobwei9@hotmail.com>
Tue, 28 Oct 2014 21:15:05 +0000 (22:15 +0100)
commit6150d9342c877192af3b3ba5da677accdfa69259
tree2be6f15e26d119e6928e0321ed3db04646d9b707
parent9028846c6315903a4d43f436aced67ca1d345e69
parentd25cc7f09085ea8f162a984b8345c6ecaebf0a65
Merge ../phpdbg into PHP-5.6

Conflicts:
sapi/phpdbg/config.m4
sapi/phpdbg/config.m4
sapi/phpdbg/config.w32
sapi/phpdbg/phpdbg_wait.c
sapi/phpdbg/phpdbg_webdata_transfer.c