]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorXinchen Hui <laruence@php.net>
Sun, 1 Jun 2014 11:41:35 +0000 (19:41 +0800)
committerXinchen Hui <laruence@php.net>
Sun, 1 Jun 2014 11:41:35 +0000 (19:41 +0800)
1  2 
ext/spl/spl_directory.c
ext/spl/spl_iterators.c

Simple merge
Simple merge