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

Merge branch 'PHP-5.6'
---

ee6bab61ebee3dad68a10ad5c5167636c03da599