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

Merge branch 'PHP-5.5'
---

faf256a4e7a779cd9f58d82c3489e1c6a94823ec