]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0'
authorMatteo Beccati <mbeccati@php.net>
Tue, 10 Nov 2015 08:10:15 +0000 (09:10 +0100)
committerMatteo Beccati <mbeccati@php.net>
Tue, 10 Nov 2015 08:10:15 +0000 (09:10 +0100)
commit0ed6e25e529c9611d95c33ebe5b0a4e41a10b92d
tree67f622ba476da6f92f1aa1e68977c90bfae8906e
parent2d750a7233f02cf9658c5221653544bce778a80e
parent3cb3979de302626af8d7bd24472ba5798693ef70
Merge branch 'PHP-7.0'

* PHP-7.0:
  Split shmop/tests/002.phpt in two (all + non-root)
  Fix bug #70886 in shmop/tests/002.phpt