From: Anatol Belski <ab@php.net>
Date: Sat, 12 Nov 2016 01:38:33 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha1~954^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8486e045db8bcde2c6bb4e0d2fbbe30fafd0dd3c;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix erroneous line in confutils.js
---

8486e045db8bcde2c6bb4e0d2fbbe30fafd0dd3c