]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Tue, 20 Mar 2012 09:21:35 +0000 (17:21 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 20 Mar 2012 09:21:35 +0000 (17:21 +0800)
* PHP-5.3:
  Ignore the temporay files in sapi/*/tests/


Trivial merge