From: Xinchen Hui <laruence@php.net>
Date: Fri, 19 Jun 2015 01:36:27 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0alpha2~2^2~70
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29087f00f6be121a46135ac7f2b014cc5c082c66;p=php

Merge branch 'PHP-5.6'
---

29087f00f6be121a46135ac7f2b014cc5c082c66