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

Merge branch 'PHP-5.5'
---

f4f255016ac8ee8a7ad1174ae7b02f3286bf4af7