From: Johannes Schlüter <johannes@php.net>
Date: Sun, 23 Feb 2014 13:56:32 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.11RC1~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2198bbce868e8a3423e05c573ab4f69417ef5b88;p=php

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

2198bbce868e8a3423e05c573ab4f69417ef5b88