From: Xinchen Hui <laruence@php.net>
Date: Fri, 19 Jun 2015 01:35:52 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.11RC1~13^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bca005c8d9fa047e2d4b0f2496f771f4a74f458d;p=php

Merge branch 'PHP-5.5' into PHP-5.6
---

bca005c8d9fa047e2d4b0f2496f771f4a74f458d