Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  typofixes

diff --cc acinclude.m4
Simple merge

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

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

diff --cc ext/pcre/pcrelib/ChangeLog
Simple merge

diff --cc ext/spl/php_spl.c
Simple merge

diff --cc win32/build/confutils.js
Simple merge