Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
5.4.24-dev now
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.24-dev now

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

* PHP-5.5:
  5.4.24-dev now
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.4.24-dev now
  merge fix
  add test
  Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)
Merge branch 'PHP-5.6'

* PHP-5.6: