From: Xinchen Hui <laruence@php.net>
Date: Tue, 20 Mar 2012 09:21:35 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: PHP-5.4.1-RC1~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=14ccdd1b556e5965bba9da11c584e9306f0349da;p=php

Merge branch 'PHP-5.3' into PHP-5.4

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

14ccdd1b556e5965bba9da11c584e9306f0349da