Merge branch 'maint' to sync with 1.5.2.1

diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt
index 04e8d004363a163930a4b8f583ab5ec997dbfe3c..5edc36f060f7cf6444dd016cbb7e073af923f5db 100644 (file)
--- a/Documentation/git-hash-object.txt
+++ b/Documentation/git-hash-object.txt
@@ -3,7 +3,7 @@ git-hash-object(1)
 
 NAME
 ----
-git-hash-object - Computes object ID and optionally creates a blob from a file
+git-hash-object - Compute object ID and optionally creates a blob from a file
 
 
 SYNOPSIS