Merge branch 'PHP-5.6'

* PHP-5.6:
  reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0
  5.6.2 now

Conflicts:
	configure.in
	main/php_version.h

diff --cc main/php_version.h
index d48ab241411eb5358927ef8de358f3dcae593689,1cd646ed021763134b71a8721b7d076caf85e232..186d9d2b7d54a1e3c7660b19706dc439b3808a80
--- 1/main/php_version.h
--- 2/main/php_version.h
+++ b/main/php_version.h
@@@ -1,8 -1,8 +1,9 @@@
  /* automatically generated by configure */
  /* edit configure.in to change version number */
 -#define PHP_MAJOR_VERSION 5
 -#define PHP_MINOR_VERSION 6
 -#define PHP_RELEASE_VERSION 2
 +#define PHP_MAJOR_VERSION 7
 +#define PHP_MINOR_VERSION 0
 +#define PHP_RELEASE_VERSION 0
  #define PHP_EXTRA_VERSION "-dev"
 -#define PHP_VERSION "5.6.2-dev"
 -#define PHP_VERSION_ID 50602
 +#define PHP_VERSION "7.0.0-dev"
 +#define PHP_VERSION_ID 70000
++