From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 13 Dec 2013 03:37:53 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~353^2~136^2~7^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=914de05bf59ba91d39b6b3f3e914fd2a456d0133;p=php

Merge branch 'PHP-5.6'
---

914de05bf59ba91d39b6b3f3e914fd2a456d0133