From: Nikita Popov <nikic@php.net>
Date: Thu, 6 Mar 2014 22:12:41 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.11RC1~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ecf757007258e0388b1b97694169cfaa2f4724c6;p=php

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

ecf757007258e0388b1b97694169cfaa2f4724c6