From: Derick Rethans <github@derickrethans.nl>
Date: Sun, 26 Jan 2014 13:02:44 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~388^2~11^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e65908643a22c0ffabf604bd948912eb7b95226;p=php

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

2e65908643a22c0ffabf604bd948912eb7b95226