From: Bob Weinand <bobwei9@hotmail.com>
Date: Tue, 24 Dec 2013 12:18:18 +0000 (+0100)
Subject: Merge branch 'master' of sapi/phpdbg into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~91
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b98abd9a8702c61845452121c57f09baf4c0ac5;p=php

Merge branch 'master' of sapi/phpdbg into PHP-5.6

 merge is necessary,
---

2b98abd9a8702c61845452121c57f09baf4c0ac5