Merge from origin/emacs-25
commitfd6632b397316146397dd478a858f0b9a90efeed
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:39:08 +0000 (7 12:39 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:39:08 +0000 (7 12:39 -0800)
treeb4cf7ad204c611d20db93f846a0b4aebadd06d31
parent8209e0384441cafb67d779bbd17ea812269ca4cc
parent9a857b922e03617c533b396705f8019871b33b54
Merge from origin/emacs-25

9a857b9 * admin/authors.el (authors-renamed-files-alist): Addition.
6d27423 Tweak refcard note about documentation location
e46a134 Improve treatment of Fortran's "class is"
etc/refcards/ru-refcard.tex
test/lisp/progmodes/f90.el