]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1402c5 1a38259)
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
authorEli Zaretskii <eliz@gnu.org>
Fri, 21 Aug 2015 13:33:46 +0000 (16:33 +0300)
committerEli Zaretskii <eliz@gnu.org>
Fri, 21 Aug 2015 13:33:46 +0000 (16:33 +0300)

Trivial merge