; Merge from origin/emacs-25

The following commit was skipped:

9d0b103 Minor fixes in calculator.el
This commit is contained in:
John Wiegley 2016-03-03 23:52:27 -08:00
commit 018bdf7528

Diff content is not available