Merge from origin/emacs-25
commitf15f6b53078ac2176f8d2c05d99d3d9b4d32986b
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:43:16 +0000 (7 12:43 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:43:16 +0000 (7 12:43 -0800)
tree046e4b81c0220bc1048b0ece01caee896629670d
parentfe6131b72468a71b1bae3bbafcb408a24a460a13
parenteeecac7ab9d1f8c3a29cffe4586e5fd2414dd671
Merge from origin/emacs-25

eeecac7 Fix minor quoting problems in doc strings
lisp/cedet/semantic/format.el
lisp/cus-edit.el
lisp/gnus/gnus-kill.el
lisp/gnus/gnus-score.el
lisp/htmlfontify.el
lisp/net/starttls.el
lisp/time.el