fix news
5.4.26 next
fix buglet in makedist
fix CVE ref for bug #66060
fix CVE ref for bug #66060
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix CVE ref for bug #66060
  5.4.26 next
  fix news

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

* PHP-5.5:
  fix CVE ref for bug #66060
  fix CVE ref for bug #66060
  fix buglet in makedist
  5.4.26 next
  fix news
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix CVE ref for bug #66060
  fix CVE ref for bug #66060
  fix buglet in makedist
  5.4.26 next
  fix news
Re-fixed bug #66469
Re-fixed bug #66469
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Re-fixed bug #66469
Merge branch 'PHP-5.6'

* PHP-5.6:
  Re-fixed bug #66469
Fixed previous commit may delete unwanted cookies. Sync tests from upper branches.
Fixed previous commit may delete unwanted cookies.
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed previous commit may delete unwanted cookies.
  Re-fixed bug #66469
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed previous commit may delete unwanted cookies. Sync tests from upper branches.
  Re-fixed bug #66469
fixed missing usleep() prototype in pgsql
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed missing usleep() prototype in pgsql
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fixed missing usleep() prototype in pgsql
Merge branch 'PHP-5.6'

* PHP-5.6:
  fixed missing usleep() prototype in pgsql