]> code.delx.au - gnu-emacs/commit
; 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)
commitb4fbd69b66a927ad8ff479bee6ca57e977d7e649
treedae27dd7ebeb733768ac5091c1c4d6b4749689e1
parenta934bf445ffaa7920aa1dfea47fe08920bbbc94c
parent6db1a873d5dbf13bf30376b16bcd83ebda269adc
; Merge from origin/emacs-25

The following commit was skipped:

6db1a87 Fix insertion of edited servers in the dribble file