From: Xinchen Hui Date: Fri, 23 Oct 2015 03:28:22 +0000 (+0800) Subject: Merge branch 'fix-folding-marker' of https://github.com/ngsw/php-src X-Git-Tag: php-7.1.0alpha1~911 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=334deefa2913cb4740e6bb30259dc65f3e07adc2;p=php Merge branch 'fix-folding-marker' of https://github.com/ngsw/php-src --- 334deefa2913cb4740e6bb30259dc65f3e07adc2