]> granicus.if.org Git - php/commitdiff
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)
* PHP-7.0:
  Split shmop/tests/002.phpt in two (all + non-root)
  Fix bug #70886 in shmop/tests/002.phpt


Trivial merge