Merge from origin/emacs-25
commit2b36ae07e3c8106e4603b330fc470f0595d28de0
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 17 Jan 2017 15:34:25 +0000 (17 07:34 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 17 Jan 2017 15:34:25 +0000 (17 07:34 -0800)
treef6de503d5995ef4eea4fd9099bf9ea4502b76ff8
parentdee6981c8de6347ef66a9a1c37d65c43a9a8c4a6
parent42614fafa273f9a692c42c4dd1220e0db49e7a4c
Merge from origin/emacs-25

42614fa Update remaining copyright years with admin.el M-x set-copyright
f17a006 * lisp/ffap.el (ffap-lax-url): Bump :version after recent cha...
etc/refcards/ru-refcard.tex
lisp/ffap.el