Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix typo: unitialized -> uninitialized
  Fix typo: unitialized -> uninitialized

Conflicts:
	ext/xmlwriter/php_xmlwriter.c

diff --cc ext/pcre/pcrelib/pcre_exec.c
Simple merge

diff --cc ext/xmlwriter/php_xmlwriter.c
index 122ed0c31eb0a2ad0a3cb0735adebe366c14ffd3,6b5c3557a4971e833cf719a70e5ffdf79204c1cc..3cab7a14587ef9b361c0957fc0d1055eacb6f34c
--- 1/ext/xmlwriter/php_xmlwriter.c
--- 2/ext/xmlwriter/php_xmlwriter.c
+++ b/ext/xmlwriter/php_xmlwriter.c
@@@ -109,10 -109,11 +109,10 @@@ static void xmlwriter_free_resource_ptr
  /* {{{ XMLWRITER_FROM_OBJECT */
  #define XMLWRITER_FROM_OBJECT(intern, object) \
        { \
 -              ze_xmlwriter_object *obj = (ze_xmlwriter_object*) zend_object_store_get_object(object TSRMLS_CC); \
 +              ze_xmlwriter_object *obj = Z_XMLWRITER_P(object); \
                intern = obj->xmlwriter_ptr; \
                if (!intern) { \
-                       php_error_docref(NULL, E_WARNING, "Invalid or unitialized XMLWriter object"); \
 -                      php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid or uninitialized XMLWriter object"); \
++                      php_error_docref(NULL, E_WARNING, "Invalid or uninitialized XMLWriter object"); \
                        RETURN_FALSE; \
                } \
        }