From: Derick Rethans <github@derickrethans.nl>
Date: Sat, 25 Jan 2014 15:16:42 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~388^2~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f62b94971f770ec3da3c96b569aeaaad9363227;p=php

Merge branch 'PHP-5.6'
---

0f62b94971f770ec3da3c96b569aeaaad9363227