Merge branch 'master' of ssh://github.com/krakjoe/phpdbg into watchpoints_recursive

Conflicts:
	phpdbg.c

diff --cc phpdbg.c
Simple merge

diff --cc phpdbg.h
Simple merge

diff --cc phpdbg_prompt.c
Simple merge

diff --cc phpdbg_prompt.h
Simple merge

diff --cc phpdbg_utils.c
Simple merge

diff --cc phpdbg_utils.h
Simple merge