Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
commit4b04d8a7d550b9d4a0e83334c80b97d6e8a60ca2
authorEli Zaretskii <eliz@gnu.org>
Fri, 19 May 2017 11:36:43 +0000 (19 14:36 +0300)
committerEli Zaretskii <eliz@gnu.org>
Fri, 19 May 2017 11:36:43 +0000 (19 14:36 +0300)
tree85e43b998d6f6ae0abd0be14dfa91e1b5d8404ac
parentb43c4616ccc9cbaf7bc1531d0e6a4a84227f339e
parent45944e0183af5b6a2e31248a815fb061f9757eed
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs