From: Andrey Hristov <andrey@php.net>
Date: Mon, 4 Feb 2013 13:28:23 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha5~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c311884e5b7534f1a55c5bf95edb2add3bd04d0b;p=php

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

c311884e5b7534f1a55c5bf95edb2add3bd04d0b