Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed the common misspelling of the word occurred (occured -> occurred)

diff --cc Zend/tests/offset_string.phpt
index 128350158e55f107926e23c072282a9ed5be8508,f7cb81bb20d35df3050cf49d15deb2da604c2867..c546b371830f4f47dc102a158ac826bb83e30115
--- 1/Zend/tests/offset_string.phpt
--- 2/Zend/tests/offset_string.phpt
+++ b/Zend/tests/offset_string.phpt
@@@ -27,13 -27,13 +27,13 @@@ var_dump($str[$arr])
  
  echo "Done\n";
  ?>
 ---EXPECTF--
 +--EXPECTF--   
  string(1) "i"
  
- Notice: String offset cast occured in %s on line %d
+ Notice: String offset cast occurred in %s on line %d
  string(1) "S"
  
- Notice: String offset cast occured in %s on line %d
+ Notice: String offset cast occurred in %s on line %d
  string(1) "S"
  
  Warning: Illegal string offset 'run away' in %s on line %d

diff --cc Zend/zend_compile.c
Simple merge

diff --cc ext/mysqli/mysqli.c
Simple merge

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

diff --cc ext/pcntl/pcntl.c
Simple merge

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

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