]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 403cb17 2973127)
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
authorEli Zaretskii <eliz@gnu.org>
Mon, 9 Feb 2015 16:27:21 +0000 (18:27 +0200)
committerEli Zaretskii <eliz@gnu.org>
Mon, 9 Feb 2015 16:27:21 +0000 (18:27 +0200)

Trivial merge