]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47f6336 316bbd9)
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
authorMario Lang <mlang@delysid.org>
Sat, 9 Jul 2016 05:06:53 +0000 (07:06 +0200)
committerMario Lang <mlang@delysid.org>
Sat, 9 Jul 2016 05:06:53 +0000 (07:06 +0200)

Trivial merge