5.5.11RC1 preparation
Fix problem with mysqli_commt()/mysqli_rollback()
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
	NEWS
	configure.in
	ext/mysqli/mysqli_api.c
	main/php_version.h
fix typo
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
	NEWS
Merge branch 'PHP-5.6'
fix compilation error
Merge branch 'PHP-5.6'