]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7bd3d0b ec7e479)
Merge branch 'PHP-5.4'
authorAnatoliy Belsky <ab@php.net>
Thu, 12 Jul 2012 09:02:33 +0000 (11:02 +0200)
committerAnatoliy Belsky <ab@php.net>
Thu, 12 Jul 2012 09:02:33 +0000 (11:02 +0200)
* PHP-5.4:
  reverted news about #62477
  reverted changes for #62477

Conflicts:
NEWS

1  2 
ext/spl/spl_iterators.c patch | diff1 | diff2 | blob | history

diff --cc ext/spl/spl_iterators.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.