Merge branch 'PHP-5.3' into PHP-5.4

Browse Source

I messed up the last merge somehow :/ Merge again.

* PHP-5.3:
  Add NEWS for bug #62262
  Fixed bug RecursiveArrayIterator does not implement Countable

Conflicts:
	ext/spl/spl_array.c

...

This commit is contained in:

Nikita Popov 2012-06-19 18:41:49 +02:00

parent cce4764f13 5d81fe6f12

commit 02cda8fd94

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