From: Bob Weinand <bobwei9@hotmail.com>
Date: Tue, 28 Oct 2014 21:15:05 +0000 (+0100)
Subject: Merge ../phpdbg into PHP-5.6
X-Git-Tag: php-5.6.3RC1~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6150d9342c877192af3b3ba5da677accdfa69259;p=php

Merge ../phpdbg into PHP-5.6

Conflicts:
	sapi/phpdbg/config.m4
---

6150d9342c877192af3b3ba5da677accdfa69259