From: Derick Rethans <github@derickrethans.nl>
Date: Tue, 9 Jul 2013 08:07:17 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2RC1~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=06cef326fd6ec9dac28bb553e4abd1a3f25ad71f;p=php

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

06cef326fd6ec9dac28bb553e4abd1a3f25ad71f