From: Xinchen Hui <laruence@gmail.com>
Date: Thu, 12 Dec 2013 16:54:36 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~353^2~142
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a299514f82777094e8822a00293036ab8e1bb41;p=php

Merge branch 'PHP-5.6'

Conflicts:
	NEWS
---

6a299514f82777094e8822a00293036ab8e1bb41