Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
commit1f778f8b1a657a723bffa0472c68557af9273e38
authorEli Zaretskii <eliz@gnu.org>
Sat, 20 Jan 2018 09:18:31 +0000 (20 11:18 +0200)
committerEli Zaretskii <eliz@gnu.org>
Sat, 20 Jan 2018 09:18:31 +0000 (20 11:18 +0200)
treedb7935cc8b62f0a3fedd9311c2b274011ce4339a
parentc0154ac7c3423f68d8f3a2e85a756c9759219039
parent666629796dd16422edffefc958656efa65d20fc6
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs