]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0acb538 0ac9d09)
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
authorEli Zaretskii <eliz@gnu.org>
Sat, 30 May 2015 12:02:51 +0000 (15:02 +0300)
committerEli Zaretskii <eliz@gnu.org>
Sat, 30 May 2015 12:02:51 +0000 (15:02 +0300)

Trivial merge