Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
commit5a5aa6ed27e910a216339df44f96f81e3d6b6ef6
authorEli Zaretskii <eliz@gnu.org>
Thu, 17 Aug 2017 14:44:22 +0000 (17 17:44 +0300)
committerEli Zaretskii <eliz@gnu.org>
Thu, 17 Aug 2017 14:44:22 +0000 (17 17:44 +0300)
tree8fc69a99aefa59aeae55c1f0f8b8db576fbaed86
parent2cfb32bf4cbb726b83db82e414acced03781f99d
parent13993c46a21495167517f76d2e36b6c09ac5e89e
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs