Merge branch 'master' of https://github.com/krakjoe/phpdbg

author krakjoe <joe.watkins@live.co.uk>

Tue, 12 Nov 2013 00:28:48 +0000 (00:28 +0000)

committer krakjoe <joe.watkins@live.co.uk>

Tue, 12 Nov 2013 00:28:48 +0000 (00:28 +0000)
author krakjoe <joe.watkins@live.co.uk>
Tue, 12 Nov 2013 00:28:48 +0000 (00:28 +0000)
committer krakjoe <joe.watkins@live.co.uk>
Tue, 12 Nov 2013 00:28:48 +0000 (00:28 +0000)
diff --cc phpdbg_help.c
Simple merge
diff --cc phpdbg_prompt.c
Simple merge
author	krakjoe <joe.watkins@live.co.uk>
	Tue, 12 Nov 2013 00:28:48 +0000 (00:28 +0000)
committer	krakjoe <joe.watkins@live.co.uk>
	Tue, 12 Nov 2013 00:28:48 +0000 (00:28 +0000)
		1	2
phpdbg_help.c	patch \|	diff1 \|	diff2 \|	blob \| history
phpdbg_prompt.c	patch \|	diff1 \|	diff2 \|	blob \| history