From: Joe Watkins <krakjoe@php.net>
Date: Fri, 23 Jun 2017 06:51:46 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha3~48^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b90373376254d510868941b497bcac6152336623;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Remove superfluous branch
---

b90373376254d510868941b497bcac6152336623