From: John Wiegley Date: Fri, 11 Mar 2016 21:32:13 +0000 (-0800) Subject: ; Merge from origin/emacs-25 X-Git-Tag: emacs-26.0.90~2349 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b4fbd69b66a927ad8ff479bee6ca57e977d7e649;p=emacs.git ; Merge from origin/emacs-25 The following commit was skipped: 6db1a87 Fix insertion of edited servers in the dribble file --- b4fbd69b66a927ad8ff479bee6ca57e977d7e649