Merge branch 'phpdbg' into PHP-5.6

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

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

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

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

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