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)
Add UConverter class (ICU's UConverter API)

RFC at http://wiki.php.net/rfc/uconverter
intl: doc explaining error conventions
Fix arginfo of BreakIterator::getLocale
Improve ERROR.CONVENTIONS
Write local err on intlcal_get_time_zone() failure
Fix zpp() call in intl/converter
intl/converter in line w/ intl error handling
Merge branch 'PHP-5.5'

* PHP-5.5:
  intl/converter in line w/ intl error handling
  Fix zpp() call in intl/converter
  Write local err on intlcal_get_time_zone() failure
  Improve ERROR.CONVENTIONS
  Fix arginfo of BreakIterator::getLocale
  intl: doc explaining error conventions
  Add UConverter class (ICU's UConverter API)
Make converter work on VS
Fixed paramter count
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed paramter count
  Make converter work on VS
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