Reflect changes made in merge 99e48d3

diff --git a/UPGRADING b/UPGRADING
index 6cfd47bfaf753b27f97761d3c3208abf2b9a2462..7d37f760002da91e285718ec99870848fddc2b09 100755 (executable)
--- a/UPGRADING
+++ b/UPGRADING
@@ -91,6 +91,8 @@ PHP X.Y UPGRADE NOTES
 - IntlDateFormatter::setTimeZoneID() and datefmt_set_timezone_id() are
   deprecated. Use IntlDateFormatter::setTimeZone() or datefmt_set_timezone()
   instead.
+- IntlDateFormatter::format() and datefmt_format() now also accept an
+  IntlCalendar object for formatting.
 
 ========================================
 5. New Functions
@@ -103,6 +105,7 @@ PHP X.Y UPGRADE NOTES
   - hash_pbkdf2()
 
 - Intl:
+  - datefmt_format_object()
   - datefmt_get_calendar_object()
   - datefmt_get_timezone()
   - datefmt_set_timezone()
@@ -178,6 +181,7 @@ PHP X.Y UPGRADE NOTES
   - intltz_get_error_code()
   - intltz_get_error_message()
 
+  - IntlDateFormatter::formatObject()
   - IntlDateFormatter::getCalendarObject()
   - IntlDateFormatter::getTimeZone()
   - IntlDateFormatter::setTimeZone()