Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
commit8de2edd9ef8b4776fd7226de285c1d135b3e6938
authorEli Zaretskii <eliz@gnu.org>
Sun, 13 Aug 2017 15:58:24 +0000 (13 18:58 +0300)
committerEli Zaretskii <eliz@gnu.org>
Sun, 13 Aug 2017 15:58:24 +0000 (13 18:58 +0300)
tree919ba4adce9f249caa2477ea05b82d316fbb24fc
parente2e3856141a315ea4a7acbd0534feaa848c4bf6b
parentabab4b091f2412b435c51b29c4d501f4fc806cb3
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs