Merge sapi/phpdbg into PHP-5.6

diff --cc sapi/phpdbg/.travis.yml
index 353402858e05fda4855f167380427e9688a13823,0000000000000000000000000000000000000000..d5b492e7cfaa090e9fc78b17755ec07ff970d9cb
mode 100644,000000..100644
--- 1/sapi/phpdbg/.travis.yml
--- /dev/null
+++ b/sapi/phpdbg/.travis.yml
@@@ -1,3 -1,0 +1,12 @@@
- script: ./travis/ci.sh
 +language: c
 +
++env:
++- PHP="PHP-5.4"
++- PHP="PHP-5.5"
++- PHP="PHP-5.6"
++- PHP="master"
++
++before_script: ./travis/ci.sh
++
++script:
++- ./php-src/sapi/cli/php php-src/sapi/phpdbg/tests/run-tests.php -diff2stdout --phpdbg php-src/sapi/phpdbg/phpdbg

diff --cc sapi/phpdbg/config.m4
Simple merge

diff --cc sapi/phpdbg/phpdbg_utils.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_utils.h
Simple merge

diff --cc sapi/phpdbg/tests/run-tests.php
Simple merge

diff --cc sapi/phpdbg/travis/ci.sh
Simple merge