Fix test typo
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'
5.4.18 next
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.18 next

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

* PHP-5.5:
  5.4.18 next
sync NEWS
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  sync NEWS
Merge branch 'PHP-5.5'

* PHP-5.5:
  sync NEWS
Clean up leftover file after the test
Remove broken client version checking
Fixed bug #65047 (Test skip on client / server version)
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #65047 (Test skip on client / server version)
  Remove broken client version checking
  Clean up leftover file after the test
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #65047 (Test skip on client / server version)
  Remove broken client version checking
  Clean up leftover file after the test
Related to bug #65047 (Test skip on client / server version)

bug46274.phpt and bug46274_2.phpt
Make query silent (when server don't know bytea_output option)

bug_49985.phpt
Make result "locale" independent
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Related to bug #65047 (Test skip on client / server version)
Merge branch 'PHP-5.5'

* PHP-5.5:
  Related to bug #65047 (Test skip on client / server version)
This will be PHP 5.3.28
Merge branch 'PHP-5.3' into PHP-5.4
Merge branch 'PHP-5.4' into PHP-5.5