Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  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 win32/build/confutils.js
Simple merge