Merge branch 'PHP-5.6'

* PHP-5.6:
  oops, forgot TSRMLS_CC

Conflicts:
	ext/date/php_date.c

diff --cc ext/date/php_date.c
index 7855a5fb7b766c0c99ad9d960c0ab1f5d51c397b,b77dbba0cdcd92387feddf5df45191d3c9120fd1..bc423d26636cadb366eee4d32647b4c2e871d779
--- 1/ext/date/php_date.c
--- 2/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@@ -2846,7 -2926,7 +2846,7 @@@ PHP_METHOD(DateTime, createFromImmutabl
        php_date_obj *new_obj = NULL;
        php_date_obj *old_obj = NULL;
  
-       if (zend_parse_parameters(ZEND_NUM_ARGS(), "O!", &datetimeimmutable_object, date_ce_immutable) == FAILURE) {
 -      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &datetimeimmutable_object, date_ce_immutable) == FAILURE) {
++      if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &datetimeimmutable_object, date_ce_immutable) == FAILURE) {
                return;
        }