Fix NEWS after 5.3.21
Merge branch 'PHP-5.3' into PHP-5.4
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'
NEWS for bug #64023 (see aa0adce)
Fix missing parameter
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix missing parameter
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix missing parameter
fix bug #60833 - self, parent, static behave inconsistently case-sensitive
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix bug #60833 - self, parent, static behave inconsistently case-sensitive

Conflicts:
	UPGRADING
allow for libpng 1.5.x
Merge branch 'PHP-5.5'

* PHP-5.5:
  allow for libpng 1.5.x
add new features
Merge branch 'PHP-5.5'

* PHP-5.5:
  add new features

Conflicts:
	UPGRADING
Implement fix for bug #46439 - add CURLFile class for safer uploads
Merge branch 'PHP-5.5'

* PHP-5.5:
  Implement fix for bug #46439 - add CURLFile class for safer uploads

Conflicts:
	UPGRADING
post-5.5 changes for bug #46439 as described in the RFC
oops, unintended addition
Implemented Feature #60524 (sys_temp_dir)

Added a new configuration directive which allows it to change the
temporary directory, the default behavior is unchanged.

This is a useful option if you use all/some hosts inside of one .ini file
with sections and want to change the temp dir per user (maybe it's not
allowed to write outside the users home directory). Since the TMPDIR
variable affects the whole php that way can not be used for this scenario.

(see https://bugs.php.net/bug.php?id=60524)
Add news for bug #60524