From: Nikita Popov <nikic@php.net>
Date: Sun, 24 Mar 2013 16:07:36 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~92^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=095d5525897ac5af248643bf248ad4a0f244a19e;p=php

Merge branch 'PHP-5.5'
---

095d5525897ac5af248643bf248ad4a0f244a19e