Merge branch 'PHP-5.4' into PHP-5.5

Browse Source

* PHP-5.4:
  5.4.13 branched, now it's 5.4.14

Conflicts:
	configure.in
	main/php_version.h

...

This commit is contained in:

Stanislav Malyshev 2013-02-26 22:26:36 -08:00

parent 84b65cf7ab 31a6f8b7f4

commit 0d65a85cc0

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