From: Bob Weinand <bobwei9@hotmail.com>
Date: Wed, 25 Jun 2014 11:57:19 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~157
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b06c8f82bdf0282d8da9d78554c3bf211c57e21;p=php

Merge branch 'PHP-5.6'
---

0b06c8f82bdf0282d8da9d78554c3bf211c57e21