Browse Source

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.11-dev

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

Diff Content Not Available