]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorEtienne Kneuss <colder@php.net>
Wed, 9 Apr 2014 09:52:11 +0000 (11:52 +0200)
committerEtienne Kneuss <colder@php.net>
Wed, 9 Apr 2014 09:52:11 +0000 (11:52 +0200)
1  2 
ext/spl/spl_iterators.c

Simple merge