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

Merge branch 'PHP-5.6'
---

0fbb421ec1221a6fcd879ee3ec5440b297a484c3