From: Glenn Morris <rgm@gnu.org>
Date: Sat, 24 Nov 2018 15:51:04 +0000 (-0800)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~4101
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0525b495112f7ca1c356166db65576c717e88eec;p=emacs.git

; Merge from origin/emacs-26

The following commit was skipped:

25a4205 Update the calc units table
---

0525b495112f7ca1c356166db65576c717e88eec