com php-src: Merge branch 'PHP-5.3' into PHP-5.4:
| From: | Xinchen Hui | Date: | Tue, 20 Mar 2012 09:21:35 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.3' into PHP-5.4: | ||
| References: | 1 2 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-68048@lists.php.net to get a copy of this message | ||
Commit: 14ccdd1b556e5965bba9da11c584e9306f0349da
Author: Xinchen Hui <laruence@php.net> Tue, 20 Mar 2012 17:21:35 +0800
Committer: Xinchen Hui <laruence@php.net> Tue, 20 Mar 2012 17:21:35 +0800
Parents: 868dbe127ac12586e5fc6a8e3514eb5007477fee 7aa2b75db2efceff502c87c5bcb4db81accf4024
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=14ccdd1b556e5965bba9da11c584e9306f0349da
Log:
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Ignore the temporay files in sapi/*/tests/
Trivial merge