fix *.dsp files related to bug #50333
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix *.dsp files related to bug #50333
Fixed arginfo of PDO::__construct() to match the docs and zend_parse_parameters definition.
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5' into PHP-5.6
Merge branch 'PHP-5.6'
add new consts
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Merge branch 'PHP-5.4' into PHP-5.5
add text for the new constants
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5' into PHP-5.6
Merge branch 'PHP-5.6'
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Merge branch 'PHP-5.6'

Conflicts:
	NEWS
	UPGRADING
Merge branch 'master' of git.php.net:php-src
Merge branch 'master' of https://github.com/php/php-src

* 'master' of https://github.com/php/php-src:
  add text for the new constants
  add new consts
Verify peers by default in client socket operations
Update NEWS/UPGRADING
Merge branch 'PHP-5.6'

* PHP-5.6:
  Update NEWS/UPGRADING
  Verify peers by default in client socket operations

Conflicts:
	ext/openssl/xp_ssl.c