Browse Source

Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
	configure.in
	main/php_version.h
PHP-5.4.11
Johannes Schlüter 14 years ago
parent
commit
811cd765a9

Diff Content Not Available