; 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:
commit
b4fbd69b66
The following commit was skipped:
6db1a87
Fix insertion of edited servers in the dribble file