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

Merge branch 'PHP-5.5'
---

7f40866248e1578fba1a18601d5c406f801bf155