From: Xinchen Hui <laruence@gmail.com>
Date: Thu, 4 Jan 2018 05:45:11 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:/php-src
X-Git-Tag: php-7.3.0alpha1~704
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a4602c45c8dcd70538de3ebbe5c6829e5ca6fcf;p=php

Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  Happy new year (Update copyright to 2018)
  Happy new year (Update copyright to 2018)
  Revert "Enable ODBC tests on AppVeyor"
  Enable ODBC tests on AppVeyor
  Skip on Travis-CI
  Extend skip section
  2018
  missing changelog entries + fix version and date
  missing changelog entries
  2018
  Trailing whitespaces
---

4a4602c45c8dcd70538de3ebbe5c6829e5ca6fcf