From: Bob Weinand <bobwei9@hotmail.com>
Date: Tue, 28 Jan 2014 12:33:44 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.10RC1~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e8bf18bd9f78a38316c7e0eca183e0591d9e1cb4;p=php

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

e8bf18bd9f78a38316c7e0eca183e0591d9e1cb4