Fix News
Fixed bug #63988 (Two Date tests fail) only for PHP-5.5
Fix bug #64011 (get_html_translation_table())

get_html_translation_table() with encoding ISO-8859-1 and HTMLENTITIES
was broken. Only entities for characters U+0000 to U+0040 were being
included in the result.
NEWS for bug #64011. See 77ee200
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS for bug #64011. See 77ee200
  Fix bug #64011 (get_html_translation_table())
  Fix News
fix bug #63462 (Magic methods called twice for unset protected properties)
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fix bug #63462 (Magic methods called twice for unset protected properties)
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix bug #63462 (Magic methods called twice for unset protected properties)
  NEWS for bug #64011. See 77ee200
  Fix bug #64011 (get_html_translation_table())
  Fix News
  Update the arguments in the prototype of fpm_socket_unix_test_connect().
  fixed build
  NEWS for bug #63893
  Fixed inconsequential bug in strtr()
  Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."
  Revert "Update fputcsv() to escape all characters equally."
  Remove _GNU_SOURCE, add local heap sort
  The compiler can figure this out
  Remove unused block
  strtr() with 2nd param array - optimization
  Refactoring, bugs & leaks
  Optimize strtr w/ 2nd arg array
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  Fixed bug #63988 (Two Date tests fail) only for PHP-5.5
  - Fixed ZTS build
  Dereferencing process-handles no longer waits on those processes.
  revert change. now it doesn't compile again...someone should fix ext/date...
  Use two dtors thus allow allocation based on the alloc model of the connection.
  plug a leak - forgot ot use the dtor already written
  Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."
  Revert "Update fputcsv() to escape all characters equally."
  Add support for connect attributes, as of MySQL 5.6
  Bug #62489: dba_insert not working as expected
  UPGRADING.INTERNALS: document zend_qsort_r
  Add zend_qsort_r & use it in strtr
  NEWS for bug #63893
  Update README.PARAMETER_PARSING_API
  Export zend_parse_parameter()
  Expose zend_parse_arg() as zend_parse_parameter()
  zend_parse_parameters: allow ! for non pointers
Class Name Resolution As Scalar Via "class" Keyword
Merge branch 'PHP-5.5' of git://github.com/php/php-src into PHP-5.5
- Fixed ZTS build
Fixed bug #64007 (There is an ability to create instance of Generator by hand).

Use get_constrctor instead of access of the ce->constructor directly
Merge fix of #62836 to ?.re, and regenerate ?.c
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	ext/standard/var_unserializer.c