From: Xinchen Hui <laruence@php.net>
Date: Mon, 26 May 2014 07:40:50 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~263^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0b0be176fd24683b761216019e2ce5670a741bf;p=php

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

b0b0be176fd24683b761216019e2ce5670a741bf