From: Derick Rethans <github@derickrethans.nl>
Date: Fri, 13 Jun 2014 22:26:43 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.15RC1~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c06ccf7c70c934e8e1d385feb7c302f8c66d40b5;p=php

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

c06ccf7c70c934e8e1d385feb7c302f8c66d40b5