]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6acd2aa bb0cd31)
; Merge from origin/emacs-25
authorJohn Wiegley <johnw@newartisans.com>
Tue, 19 Jan 2016 06:56:33 +0000 (22:56 -0800)
committerJohn Wiegley <johnw@newartisans.com>
Tue, 19 Jan 2016 06:56:33 +0000 (22:56 -0800)
The following commit was skipped:

bb0cd31 Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25


Trivial merge