From: Matteo Beccati <mbeccati@php.net>
Date: Tue, 10 Nov 2015 08:10:15 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~829
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ed6e25e529c9611d95c33ebe5b0a4e41a10b92d;p=php

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
---

0ed6e25e529c9611d95c33ebe5b0a4e41a10b92d