From: Bob Weinand <bobwei9@hotmail.com>
Date: Thu, 20 Feb 2014 16:48:38 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.11RC1~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca313caa4bb84d86c4f0b37493791fe27ee869af;p=php

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

ca313caa4bb84d86c4f0b37493791fe27ee869af