]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f991a50 52f64cc)
; Merge from origin/emacs-25
authorJohn Wiegley <johnw@newartisans.com>
Fri, 4 Mar 2016 07:53:26 +0000 (23:53 -0800)
committerJohn Wiegley <johnw@newartisans.com>
Fri, 4 Mar 2016 07:53:26 +0000 (23:53 -0800)
The following commit was skipped:

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


Trivial merge