Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25

This commit is contained in:
Eli Zaretskii 2016-12-19 19:59:00 +02:00
commit dfc9f114c7

Diff content is not available