From: Johannes Schlüter <johannes@php.net>
Date: Fri, 1 Feb 2013 11:32:00 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha5~43^2~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9c821ec7a1003f5f7988114e8724657dbe026e7d;p=php

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

9c821ec7a1003f5f7988114e8724657dbe026e7d