Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  non living code related typo fixes

Conflicts:
	Zend/zend_compile.c

diff --cc Zend/zend_builtin_functions.c
Simple merge

diff --cc Zend/zend_compile.c
index 196688e46e093b53dfb48537e25edbe8c7b07e8f,326d4ef976795e57d4794d701b6cdef4d4aa4faa..f250b2be20879a579ac5f73fb3377c793242800b
--- 1/Zend/zend_compile.c
--- 2/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@@ -1734,7 -1723,7 +1734,7 @@@ void zend_do_begin_function_declaration
        }
  
        {
-               /* Push a seperator to the switch stack */
 -              /* Push a separator to the switch and foreach stacks */
++              /* Push a separator to the switch stack */
                zend_switch_entry switch_entry;
  
                switch_entry.cond.op_type = IS_UNUSED;

diff --cc Zend/zend_execute_API.c
Simple merge

diff --cc Zend/zend_globals.h
Simple merge

diff --cc Zend/zend_language_scanner.h
Simple merge

diff --cc configure.in
Simple merge

diff --cc ext/date/php_date.c
Simple merge

diff --cc ext/date/php_date.h
Simple merge

diff --cc ext/mbstring/oniguruma/HISTORY
Simple merge

diff --cc ext/mysql/php_mysql.c
Simple merge

diff --cc ext/mysqlnd/mysqlnd_net.c
Simple merge

diff --cc ext/reflection/php_reflection.c
Simple merge

diff --cc ext/sqlite3/libsqlite/sqlite3.c
Simple merge

diff --cc ext/standard/pack.c
Simple merge