From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 7 Dec 2016 20:41:05 +0000 (-0800)
Subject: Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~1165
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=99e20f105aa8a33ca9e70b741400a46447a287af;p=emacs.git

Merge from origin/emacs-25

ba2847f ; * lisp/vc/ediff-util.el (ediff-janitor): Fix last change.  ...
8b43f97 * lisp/vc/ediff-util.el (ediff-janitor): Doc fix.  (Bug#25046)
c20035c ; * doc/emacs/programs.texi (Man Page): Fix last change.
93d8346 Improve indexing of 'man'
---

99e20f105aa8a33ca9e70b741400a46447a287af