From: Xinchen Hui <laruence@php.net>
Date: Thu, 4 Jun 2015 13:09:06 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0alpha1~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c6db18f9ab0f512df573bca9538f1aace9a1a6d2;p=php

Merge branch 'PHP-5.6'
---

c6db18f9ab0f512df573bca9538f1aace9a1a6d2