From: Derick Rethans <github@derickrethans.nl>
Date: Fri, 13 Jun 2014 22:26:50 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~191
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1a708b28c6987b61fa1ac416cf9d2999ec9ccf8;p=php

Merge branch 'PHP-5.6'
---

b1a708b28c6987b61fa1ac416cf9d2999ec9ccf8