From: Nikita Popov <nikic@php.net>
Date: Thu, 28 Mar 2013 17:24:27 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~64
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f5e5878701f53fc7733ef227c1c64f04305002a6;p=php

Merge branch 'PHP-5.5'
---

f5e5878701f53fc7733ef227c1c64f04305002a6