fix tests
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix tests
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  fix valgrind warning
  Fix bug #64023 (__toString() & SplFileInfo)
  Fix test related to change for #bug64007 and also fix in newInstanceArgs
  NEWS: Start PHP 5.5.0 Beta 1 section
  NEWS for PHP 5.5.0alpha4
  Fix NEWS
fix tests
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix tests
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix tests
  fix tests
now we have also an xz archive
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