From: Andrey Hristov <andrey@php.net>
Date: Thu, 7 Feb 2013 15:24:44 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~555
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67ccb99f2ccba3abfdb25aafff6d3d3a399426de;p=php

Merge branch 'PHP-5.5'
---

67ccb99f2ccba3abfdb25aafff6d3d3a399426de