From: Bob Weinand <bobwei9@hotmail.com>
Date: Wed, 4 Jun 2014 00:20:35 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~245
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e85b9e86b561a6e92a5bd82b4bda6b069e25d7a;p=php

Merge branch 'PHP-5.6'

Conflicts:
	sapi/phpdbg/phpdbg.c
---

1e85b9e86b561a6e92a5bd82b4bda6b069e25d7a