]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4a18d16 4786618)
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
authorMichael Albinus <michael.albinus@gmx.de>
Wed, 26 Aug 2015 08:33:29 +0000 (10:33 +0200)
committerMichael Albinus <michael.albinus@gmx.de>
Wed, 26 Aug 2015 08:33:29 +0000 (10:33 +0200)

Trivial merge