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

Merge branch 'PHP-5.5'
---

402296d46cb1fabd526921ef3a7b92a0f797ef6c