From: Xinchen Hui Date: Mon, 9 Mar 2015 03:43:10 +0000 (+0800) Subject: Merge branch 'filter/adjust-logic' of https://github.com/whatthejeff/php-src X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~752 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7bf082d63817fca0dd221e451842f92b477f8002;p=php Merge branch 'filter/adjust-logic' of https://github.com/whatthejeff/php-src --- 7bf082d63817fca0dd221e451842f92b477f8002