less serious compatAbility fixes
typos (orig)
typo fixes
revert false fix
typos (orig)
less serious compatAbility fixes
typo fixes
revert false fix
typos (orig)
less serious compatAbility fixes
typo fixes
revert false fix
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  revert false fix
  typo fixes
  less serious compatAbility fixes
  typos (orig)

Conflicts:
	ext/mysql/php_mysql.c
Merge branch 'PHP-5.5'

* PHP-5.5:
  revert false fix
  typo fixes
  less serious compatAbility fixes
  typos (orig)
  revert false fix
  typo fixes
  typos (orig)
  less serious compatAbility fixes
fix invalid variable name at ext/spl/internal/multipleiterator.inc
fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
  fix invalid variable name at ext/spl/internal/multipleiterator.inc
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
  fix invalid variable name at ext/spl/internal/multipleiterator.inc
Remove PWS (Personal Web Server) references
Merge branch 'PHP-5.5'

* PHP-5.5:
  Remove PWS (Personal Web Server) references