From: Bob Weinand <bobwei9@hotmail.com>
Date: Mon, 25 Nov 2013 22:47:21 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/krakjoe/phpdbg
X-Git-Tag: php-5.6.0alpha1~110^2~44^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b5b5bba49245c38be6e9db885ee03500d5ceec6d;p=php

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

Conflicts:
	phpdbg.c
---

b5b5bba49245c38be6e9db885ee03500d5ceec6d