]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorDavid Soria Parra <dsp@php.net>
Wed, 18 Sep 2013 13:06:51 +0000 (15:06 +0200)
committerDavid Soria Parra <dsp@php.net>
Wed, 18 Sep 2013 13:06:51 +0000 (15:06 +0200)
commit94e4c4df86719dbdf265b9d7ccfd1db8cfd32fdf
tree346f8b0ce00a53ab2f52c132d2e081f38efa6a56
parent2eb566188625162644a186bcb6757f22978c54f9
parent7a24ee13ec74bf3e85970e59dd69db8034ff434c
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
ext/spl/spl_iterators.c