]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Tue, 20 Mar 2012 08:00:21 +0000 (16:00 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 20 Mar 2012 08:00:21 +0000 (16:00 +0800)
commit4b6772f847f460a512de6f230c8bfdf866253eb2
tree831bbb4e9b11e72ea54114a804e669705d483153
parent1a42558832f729bdd59934b322aced68596d8173
parent868dbe127ac12586e5fc6a8e3514eb5007477fee
Merge branch 'PHP-5.4'

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