Merge branch 'PHP-5.5'

* PHP-5.5:
  next is 5.5.2
  add a few comment
  allow both the old and new cfg argument to work. (the old of course should contain the typo)
  mssql.compatability_mode fix

Conflicts:
	configure.in
	main/php_version.h

diff --cc php.ini-development
Simple merge

diff --cc php.ini-production
Simple merge