From: Derick Rethans <github@derickrethans.nl>
Date: Sun, 2 Mar 2014 19:18:58 +0000 (-0500)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~504^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=18178aa013d4a90ebd77d0bdb1f69f122f108230;p=php

Merge branch 'PHP-5.6'
---

18178aa013d4a90ebd77d0bdb1f69f122f108230