Merge branch 'master' into jc/diff

diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt
index bf8db8bac60a3d139209e2801c778bac3028dc24..54fb922ba9704112f953e4f6de25f053e81b2097 100644 (file)
--- a/Documentation/git-shortlog.txt
+++ b/Documentation/git-shortlog.txt
@@ -3,7 +3,7 @@ git-shortlog(1)
 
 NAME
 ----
-git-shortlog - Summarize 'git log' output.
+git-shortlog - Summarize 'git log' output
 
 
 SYNOPSIS