From: John Wiegley <johnw@newartisans.com>
Date: Fri, 4 Mar 2016 07:52:27 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2391
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=018bdf7528d0d4bb0560d86b84c21ae9fed1206a;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

9d0b103 Minor fixes in calculator.el
---

018bdf7528d0d4bb0560d86b84c21ae9fed1206a