]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d88977 ed19f20)
; Merge from origin/emacs-25
authorJohn Wiegley <johnw@newartisans.com>
Sat, 2 Apr 2016 21:51:34 +0000 (14:51 -0700)
committerJohn Wiegley <johnw@newartisans.com>
Sat, 2 Apr 2016 21:51:34 +0000 (14:51 -0700)
The following commit was skipped:

ed19f20 Merge branch 'emacs-25' of /home/acm/emacs/emacs.git/emacs-25...


Trivial merge