Add missing E_DEPRECATED error for https://wiki.php.net/rfc/default_encoding
Fixed typo
Merge branch 'pull-request/622' into PHP-5.6

* pull-request/622:
  Fixed typo
  Add missing E_DEPRECATED error for https://wiki.php.net/rfc/default_encoding
5.5.11RC1 preparation
Restore NEWS and UPGRADING for hash_equals().
Fix problem with mysqli_commt()/mysqli_rollback()
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
	NEWS
	configure.in
	ext/mysqli/mysqli_api.c
	main/php_version.h
fix typo
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
	NEWS
fix compilation error
Change test package name ARRAYBINDPKG1 to a per-file unique name to aid parallel testing
OCI8: fix prototypes for oci_field_*().  They can take a column index or name.
Merge branch 'oci_field_doc_prototype_fixes' into PHP-5.6

* oci_field_doc_prototype_fixes:
  OCI8: fix prototypes for oci_field_*().  They can take a column index or name.
Updated UPGRADING to add three changes
Add default_charset handling
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport

* origin/PHP-5.6:
  Add default_charset handling
  Updated UPGRADING to add three changes
  OCI8: fix prototypes for oci_field_*().  They can take a column index or name.
  Change test package name ARRAYBINDPKG1 to a per-file unique name to aid parallel testing
  fix compilation error
  fix typo
  Fix problem with mysqli_commt()/mysqli_rollback()
  Restore NEWS and UPGRADING for hash_equals().
  5.5.11RC1 preparation
  Fixed typo
  Add missing E_DEPRECATED error for https://wiki.php.net/rfc/default_encoding

Conflicts:
	ext/mysqli/mysqli_api.c
	ext/mysqlnd/mysqlnd.c
	ext/standard/html.c