]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eedff18 1f01f8b)
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
authorEli Zaretskii <eliz@gnu.org>
Mon, 6 Apr 2015 10:28:33 +0000 (13:28 +0300)
committerEli Zaretskii <eliz@gnu.org>
Mon, 6 Apr 2015 10:28:33 +0000 (13:28 +0300)

Trivial merge