From: Derick Rethans <github@derickrethans.nl>
Date: Thu, 19 Dec 2013 19:01:08 +0000 (+0000)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~353^2~121^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db025b378906d06a9543be4918431fa1ac7b3b04;p=php

Merge branch 'PHP-5.6'
---

db025b378906d06a9543be4918431fa1ac7b3b04