Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
commit2e4e74ea9c21f8a8cc73172cf4a41e5116a9dadc
authorEli Zaretskii <eliz@gnu.org>
Tue, 16 Aug 2016 18:35:17 +0000 (16 21:35 +0300)
committerEli Zaretskii <eliz@gnu.org>
Tue, 16 Aug 2016 18:35:17 +0000 (16 21:35 +0300)
tree738128da7cadae80756fe6498f6433bb3094f76b
parent7d639f3be66e9b41f53e6349f8362ef0f1042e26
parent66dea652ef5f5eacb7bdec23068f0b684f69956d
Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25