From: Andrey Hristov <andrey@php.net>
Date: Thu, 8 Aug 2013 11:53:08 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~332
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42dbc598dd180369db770b16f137dd56e8478290;p=php

Merge branch 'PHP-5.5'
---

42dbc598dd180369db770b16f137dd56e8478290