]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ca3667 01d70ef)
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 26 May 2016 20:20:29 +0000 (13:20 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 26 May 2016 20:20:29 +0000 (13:20 -0700)

Trivial merge