From: Xinchen Hui <laruence@php.net>
Date: Sat, 19 Jul 2014 09:19:57 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~69
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c0e22f50c70cdcd62c4b8ccae0ca5ecd7c0ad26;p=php

Merge branch 'PHP-5.6'
---

1c0e22f50c70cdcd62c4b8ccae0ca5ecd7c0ad26