From: Derick Rethans <github@derickrethans.nl>
Date: Tue, 25 Mar 2014 12:17:19 +0000 (+0000)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~443^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dcc0644cde494fdee72295825143027d7c23b358;p=php

Merge branch 'PHP-5.5' into PHP-5.6
---

dcc0644cde494fdee72295825143027d7c23b358