; Merge from origin/emacs-25

The following commit was skipped:

38698b6 ; * lisp/vc/vc-hooks.el: corrected docstring of face
This commit is contained in:
John Wiegley 2016-03-03 23:53:27 -08:00
commit c69aef14dd

Diff content is not available