From: John Wiegley <johnw@newartisans.com>
Date: Fri, 4 Mar 2016 07:53:27 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2381
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c69aef14ddc150da07dcd3527b5a9fb99d6cef34;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

38698b6 ; * lisp/vc/vc-hooks.el: corrected docstring of face
---

c69aef14ddc150da07dcd3527b5a9fb99d6cef34