From: Derick Rethans <github@derickrethans.nl>
Date: Mon, 22 Apr 2013 16:51:47 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta4~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0720804e7cac9b221de9c0994d11de19b1c14037;p=php

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

0720804e7cac9b221de9c0994d11de19b1c14037