]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eabd667 7c1802f)
Merge branch 'emacs-25' of /home/acm/emacs/emacs.git/emacs-25 into emacs-25
authorAlan Mackenzie <acm@muc.de>
Wed, 30 Mar 2016 16:53:36 +0000 (16:53 +0000)
committerAlan Mackenzie <acm@muc.de>
Wed, 30 Mar 2016 16:53:36 +0000 (16:53 +0000)

Trivial merge