]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Thu, 22 Mar 2012 09:23:02 +0000 (17:23 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 22 Mar 2012 09:23:02 +0000 (17:23 +0800)
* PHP-5.4:
  Ignore the tempoary files


Trivial merge