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

Merge branch 'PHP-5.6'
---

7ee66c51e62ed1d398382dd4436ddebb2bd535d5