]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Tue, 20 Mar 2012 09:22:03 +0000 (17:22 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 20 Mar 2012 09:22:03 +0000 (17:22 +0800)
commitac38f4e113b7ba958e1e678943407b3bad789e9e
tree831bbb4e9b11e72ea54114a804e669705d483153
parent4b6772f847f460a512de6f230c8bfdf866253eb2
parent14ccdd1b556e5965bba9da11c584e9306f0349da
Merge branch 'PHP-5.4'

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