]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorTjerk Meesters <datibbaw@php.net>
Tue, 14 Oct 2014 15:00:17 +0000 (23:00 +0800)
committerTjerk Meesters <datibbaw@php.net>
Tue, 14 Oct 2014 15:00:17 +0000 (23:00 +0800)
commit1f4f2ef403e8b8df206bf337cc475483b4ba0a2f
tree92be14f8c86dad508744cc147c6c5092cd6082ec
parentd2daa19701bdf0ac72bb6c23d868949185ca6723
parentfb35d7c56ec32ca43bcdb3e151bf1766b52984fe
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #68128

Conflicts:
ext/spl/spl_iterators.c
ext/spl/spl_engine.h
ext/spl/spl_iterators.c