This will be PHP 5.3.23
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
	configure.in
	main/php_version.h
Merge branch 'PHP-5.4' into PHP-5.5