]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: acb96f2 d5fdffe)
Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
authorAlan Mackenzie <acm@muc.de>
Tue, 24 Nov 2015 17:43:52 +0000 (17:43 +0000)
committerAlan Mackenzie <acm@muc.de>
Tue, 24 Nov 2015 17:43:52 +0000 (17:43 +0000)

Trivial merge