From: Derick Rethans <github@derickrethans.nl>
Date: Tue, 13 May 2014 15:36:59 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.13RC1~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e3a48b3a43eb486ae969729616acfe994977b7be;p=php

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

e3a48b3a43eb486ae969729616acfe994977b7be