Browse Source

Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
	configure.in
	main/php_version.h
pull/203/head
Johannes Schlüter 14 years ago
parent
commit
d2bee32dfc

Diff Content Not Available