From: Xinchen Hui <laruence@php.net>
Date: Thu, 22 Mar 2012 09:23:02 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~411^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31ae08b62f795c3e62dadf52d189d082f77a6556;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Ignore the tempoary files
---

31ae08b62f795c3e62dadf52d189d082f77a6556