From: Johannes Schlüter <johannes@php.net>
Date: Thu, 25 Apr 2013 16:05:40 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0RC1~32^2~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6251706ea681ac6685008f63c9e169d09e6c474a;p=php

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

6251706ea681ac6685008f63c9e169d09e6c474a