From: Xinchen Hui Date: Fri, 21 Feb 2014 14:41:48 +0000 (+0800) Subject: Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2 X-Git-Tag: POST_PHPNG_MERGE~412^2~597^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=013cc55395e2b60e801eb9a8bced0219d17df129;p=php Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2 Conflicts: Zend/zend_language_scanner.c Zend/zend_language_scanner.l --- 013cc55395e2b60e801eb9a8bced0219d17df129