From: Andrey Hristov <andrey@php.net>
Date: Fri, 22 Feb 2013 12:50:13 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~514
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ad32ef12a4bcf67ce0b4a225590926c5b3cfffd;p=php

Merge branch 'PHP-5.5'
---

3ad32ef12a4bcf67ce0b4a225590926c5b3cfffd