Remove obsolete description
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Remove obsolete description
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Remove obsolete description

Conflicts:
	php.ini-development
	php.ini-production
Merge branch 'PHP-5.6'

* PHP-5.6:
  Remove obsolete description
Prevent invalid SAN peer verification on null byte prefix attack
Update NEWS/UPGRADING
Merge branch '5.6'

* 5.6:
  Update NEWS/UPGRADING
  Prevent invalid SAN peer verification on null byte prefix attack
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'