From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 25 Sep 2017 18:16:05 +0000 (-0700)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~6296
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=00a86a558ed3cde443b41c0e24934f61dea99236;p=emacs.git

; Merge from origin/emacs-26

The following commit was skipped:

546413e1ac * test/src/lcms-tests.el (lcms-whitepoint): Skip if lcms2 ...
---

00a86a558ed3cde443b41c0e24934f61dea99236