]> granicus.if.org Git - php/commit
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)
commit14ccdd1b556e5965bba9da11c584e9306f0349da
tree4e25dd20df57e7bd99c7c3bcc5308f869a37cabd
parent868dbe127ac12586e5fc6a8e3514eb5007477fee
parent7aa2b75db2efceff502c87c5bcb4db81accf4024
Merge branch 'PHP-5.3' into PHP-5.4

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