Merge branch 'datefmt_tz_cal_interop'

* datefmt_tz_cal_interop:
  Readded accidentally removed line
  Added IntlDateFormatter::formatObject(). Refactor
  Refactored internal_get_timestamp()
  Unified zval -> UDate conversions

diff --cc ext/intl/calendar/calendar_methods.cpp
index 539b11a1f7e6624022f39045a8b66662bd99aa9c,f59edaa25e3335bb91d1328fc61c3890df82f9f4..f2758fdcc8b29b8743c5f6fa7153fe001a99df1f
--- 1/ext/intl/calendar/calendar_methods.cpp
--- 2/ext/intl/calendar/calendar_methods.cpp
+++ b/ext/intl/calendar/calendar_methods.cpp
@@@ -23,9 -23,11 +23,12 @@@
  #include <unicode/locid.h>
  #include <unicode/calendar.h>
  #include <unicode/ustring.h>
+ 
  #include "../intl_convertcpp.h"
+ #include "../common/common_date.h"
+ 
  extern "C" {
 +#include "../php_intl.h"
  #define USE_TIMEZONE_POINTER 1
  #include "../timezone/timezone_class.h"
  #define USE_CALENDAR_POINTER 1

diff --cc ext/intl/config.m4
Simple merge

diff --cc ext/intl/config.w32
Simple merge

diff --cc ext/intl/dateformat/dateformat_class.c
Simple merge

diff --cc ext/intl/php_intl.c
Simple merge

diff --cc ext/intl/timezone/timezone_methods.cpp
index caf5dcdedc057c27d0882712a01ae1051ea8c9d9,c35f0b87217fa10c1a86af6b233d1973a14fd834..9ca6b44c896d73de84de2d0ae4b5bbe09e0363b2
--- 1/ext/intl/timezone/timezone_methods.cpp
--- 2/ext/intl/timezone/timezone_methods.cpp
+++ b/ext/intl/timezone/timezone_methods.cpp
@@@ -24,8 -24,10 +24,11 @@@
  #include <unicode/timezone.h>
  #include <unicode/ustring.h>
  #include "intl_convertcpp.h"
+ 
+ #include "../common/common_date.h"
+ 
  extern "C" {
 +#include "../php_intl.h"
  #define USE_TIMEZONE_POINTER 1
  #include "timezone_class.h"
  #include "intl_convert.h"