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

Merge branch 'PHP-5.5'
---

fce19c5f575538cee3d08baf7a84dc3ed2fe5e52