From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 12 Apr 2016 15:50:47 +0000 (-0700)
Subject: Merge from origin/emacs-25
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/7c2c2196fd4be0b656bdf0e0b68f3d7c4a5eca08

Merge from origin/emacs-25

ca50981 Improve time zone documentation
c23c965 Prevent bootstrap autoload backup files
9344612 Disable multicolor fonts on OS X since they are not supported...
c41ce1c Capitalize “Universal Time” in documentation
10597c9 Don't use 'find-program'
---

7c2c2196fd4be0b656bdf0e0b68f3d7c4a5eca08