From: Xinchen Hui <laruence@gmail.com>
Date: Wed, 5 Mar 2014 10:02:35 +0000 (+0800)
Subject: Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
X-Git-Tag: POST_PHPNG_MERGE~412^2~417^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=581fa5822e61dc8763be5457f19ddcd3889927e7;p=php

Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2

Conflicts:
	ext/standard/array.c
---

581fa5822e61dc8763be5457f19ddcd3889927e7