From: Xinchen Hui <laruence@php.net>
Date: Tue, 20 Mar 2012 09:22:03 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~416^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac38f4e113b7ba958e1e678943407b3bad789e9e;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Ignore the temporay files in sapi/*/tests/
---

ac38f4e113b7ba958e1e678943407b3bad789e9e