From: Derick Rethans <github@derickrethans.nl>
Date: Wed, 23 Oct 2013 21:33:54 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.6RC1~3^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb73d18c85d6deabc76bdc066f0551a88d01af81;p=php

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

bb73d18c85d6deabc76bdc066f0551a88d01af81