Browse Source

Merge branch 'PHP-5.6'

* PHP-5.6:
  5.6.13 now

Conflicts:
	configure.in
	main/php_version.h
pull/1435/head
Julien Pauli 11 years ago
parent
commit
c274e2397d

Diff Content Not Available