From: Derick Rethans <github@derickrethans.nl>
Date: Tue, 18 Mar 2014 14:48:56 +0000 (+0000)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.11RC1~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2dfb8fbdf4f73f7a1f7f3abf86aff0425637bc0a;p=php

Merge branch 'PHP-5.4' into PHP-5.5
---

2dfb8fbdf4f73f7a1f7f3abf86aff0425637bc0a