Browse Source

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix NEWS
  5.4.10-dev

Conflicts:
	configure.in
	main/php_version.h
pull/242/head
Stanislav Malyshev 14 years ago
parent
commit
57204ae6d9

Diff Content Not Available