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

Merge branch 'PHP-5.5'
---

b472d0733a356a7fa628356faf6eaeae896f7f19