]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b3f2874 1ba357e)
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
authorMichael Albinus <michael.albinus@gmx.de>
Wed, 8 Apr 2015 09:52:12 +0000 (11:52 +0200)
committerMichael Albinus <michael.albinus@gmx.de>
Wed, 8 Apr 2015 09:52:12 +0000 (11:52 +0200)

Trivial merge