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

Merge branch 'PHP-5.5'
---

e1a5edaac2e57cecfaf235d3ac985e7be04991d4