Fix NEWS after 5.3.21
Merge branch 'PHP-5.3' into PHP-5.4
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
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 fix of #62836 to ?.re, and regenerate ?.c
Fix bug #64023 (__toString() & SplFileInfo)

Defining a __toString() method was having no effect when concatenating
the object. This was because the cast_object() handler would ignore
__toString().

Using echo() directly would actually use __toString(), but this was a
bug: the ECHO handler would try zend_std_cast_object_tostring() before
cast_object(), but cast_object() should have priority as
zend_std_cast_object_tostring() assumes an object with a
zend_class_entry.
Merge branch 'bug64023' into PHP-5.4

* bug64023:
  Fix bug #64023 (__toString() & SplFileInfo)

Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
NEWS for bug #64023 (see aa0adce)
fix tests
Fix missing parameter
Fix bug #62524, only follow redirects in file streams for 3xx HTTP statuses
Fix bug #64099 (Wrong TSRM usage in zend_register_class_alias)
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
Merge branch 'PHP-5.3' into PHP-5.4
update NEWS
branched 5.4.12
Fix build problem in C++11