From: Xinchen Hui <laruence@php.net>
Date: Mon, 11 Aug 2014 09:47:47 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc06b4f941a7db0323f08c1ba4ebc1db9054502e;p=php

Merge branch 'PHP-5.6'
---

dc06b4f941a7db0323f08c1ba4ebc1db9054502e