Merge branch 'PHP-5.5' into PHP-5.6

Browse Source

* PHP-5.5:
  5.5.30 next

Conflicts:
	configure.in
	main/php_version.h

...

This commit is contained in:

Julien Pauli 2015-09-02 17:42:00 +02:00

parent a6c063d663 ea807f9c07

commit c07150cd1a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available