From: Derick Rethans <github@derickrethans.nl>
Date: Tue, 13 May 2014 15:37:05 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~282^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db42f83c2e22e0d29585426768be85d08399dd28;p=php

Merge branch 'PHP-5.5' into PHP-5.6
---

db42f83c2e22e0d29585426768be85d08399dd28