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