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

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

415233d26d881f0b0d4cb26330eab06019674510