From: Xinchen Hui <laruence@gmail.com>
Date: Wed, 3 Jan 2018 08:02:15 +0000 (+0800)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha1~707
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a76eeea73608e2d4d088a1c00ec985907e327d24;p=php

Merge branch 'PHP-7.2'

* PHP-7.2:
  Happy new year (Update copyright to 2018)

Conflicts:
	ext/phar/LICENSE
---

a76eeea73608e2d4d088a1c00ec985907e327d24