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

Merge branch 'PHP-7.1'

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

595ad898c1b1f584dce5dc65d50bdb356e20f6a5