]> git.eshelyaron.com Git - emacs.git/commitdiff
; Merge from origin/emacs-25
authorJohn Wiegley <johnw@newartisans.com>
Fri, 11 Mar 2016 21:32:13 +0000 (13:32 -0800)
committerJohn Wiegley <johnw@newartisans.com>
Fri, 11 Mar 2016 21:32:13 +0000 (13:32 -0800)
The following commit was skipped:

6db1a87 Fix insertion of edited servers in the dribble file


Trivial merge