PHP 5.5.20 now
Fixed test to work with recent libcurl versions
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed test to work with recent libcurl versions
  PHP 5.5.20 now

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

* PHP-5.6:
  Fixed test to work with recent libcurl versions
  PHP 5.5.20 now