From: Xinchen Hui Date: Tue, 20 Mar 2012 08:00:21 +0000 (+0800) Subject: Merge branch 'PHP-5.4' X-Git-Tag: php-5.5.0alpha1~418 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b6772f847f460a512de6f230c8bfdf866253eb2;p=php Merge branch 'PHP-5.4' * PHP-5.4: Ignore the temporay files in sapi/*/tests/ --- 4b6772f847f460a512de6f230c8bfdf866253eb2