From: Joe Watkins <krakjoe@php.net>
Date: Mon, 24 Jul 2017 16:24:22 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0beta2~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=515b39688938a37a48cb54850668fabb6e3915c3;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Update copyright year to 2017
---

515b39688938a37a48cb54850668fabb6e3915c3