]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 282030f 64a568d)
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
authorMichael Albinus <michael.albinus@gmx.de>
Wed, 20 Jan 2016 10:03:36 +0000 (11:03 +0100)
committerMichael Albinus <michael.albinus@gmx.de>
Wed, 20 Jan 2016 10:03:36 +0000 (11:03 +0100)

Trivial merge