From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 5 Mar 2014 07:26:35 +0000 (+0400)
Subject: Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
X-Git-Tag: POST_PHPNG_MERGE~412^2~421
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd7c7e6fb2f8a172fc7d1ee2a9e5fcbb71366603;p=php

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

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

dd7c7e6fb2f8a172fc7d1ee2a9e5fcbb71366603