]> git.eshelyaron.com Git - emacs.git/commitdiff
projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a934bf4 6db1a87)
; 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
Unnamed repository; edit this file 'description' to name the repository.