master updated (66d1513 -> 794c5a0)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  66d1513   Fix problems with 'C-c C-n' in sh-script-mode
       new  150fc9c   Do not count git markers as "deleted lines"
       new  794c5a0   Add s Symbol entry in the glossary


Summary of changes:
 doc/emacs/glossary.texi | 6 ++++++
 lisp/vc/diff-mode.el    | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)