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

Merge branch 'PHP-5.5'
---

f2a2b418ec2be07a3046ab7ca541a90cc4572162