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