; Merge from origin/emacs-25

The following commit was skipped:

6db1a87 Fix insertion of edited servers in the dribble file
This commit is contained in:
John Wiegley 2016-03-11 13:32:13 -08:00
commit b4fbd69b66

Diff content is not available