]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorTjerk Meesters <datibbaw@php.net>
Sun, 18 May 2014 13:55:44 +0000 (21:55 +0800)
committerTjerk Meesters <datibbaw@php.net>
Sun, 18 May 2014 14:51:36 +0000 (22:51 +0800)
commit6aac353accfb205bf555d2edfb7255b42ee6fc73
tree279cbb91479ca0f422a28d4ba2c0609c03d7c1bd
parent886fafc34f046c1887ea97eed9faf256be1dc3eb
parentd4295eb26a1264f6f760847f3fa1eddfbf890f7b
Merge branch 'PHP-5.6'

Conflicts:
ext/spl/spl_array.c
ext/spl/spl_array.c