Merge remote-tracking branch 'phpdbg/master' into PHP-5.6

diff --cc sapi/phpdbg/.gitignore
index af445861acdbb1efc63ddcd53d2a309a535e454c,0000000000000000000000000000000000000000..5506a2652d09ffcc7738f4e54f598f6816c49493
mode 100644,000000..100644
--- 1/sapi/phpdbg/.gitignore
--- /dev/null
+++ b/sapi/phpdbg/.gitignore
@@@ -1,7 -1,0 +1,5 @@@
- phpdbg_parser.c
- phpdbg_parser.h
 +.libs/
 +phpdbg
 +*.lo
 +*.o
 +build

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

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

diff --cc sapi/phpdbg/phpdbg_lexer.l
Simple merge

diff --cc sapi/phpdbg/phpdbg_parser.c
index 0000000000000000000000000000000000000000,79af58f8c9a7f8b1f948c5a387151bfb60edf598..79af58f8c9a7f8b1f948c5a387151bfb60edf598
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_parser.c
+++ b/sapi/phpdbg/phpdbg_parser.c

diff --cc sapi/phpdbg/phpdbg_parser.h
index 0000000000000000000000000000000000000000,6acb8963c9e1744e8d990480312dad52452e95e6..6acb8963c9e1744e8d990480312dad52452e95e6
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_parser.h
+++ b/sapi/phpdbg/phpdbg_parser.h

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