Merge branch 'maint'

diff --git a/Documentation/git-gui.txt b/Documentation/git-gui.txt
index bd613b2fcfcd77cf61d4f67944e56a11aeb2c7d4..13252a1aa6b59a09185f5584a910f9b4daa69bc1 100644 (file)
--- a/Documentation/git-gui.txt
+++ b/Documentation/git-gui.txt
@@ -89,7 +89,7 @@ See Also
 Other
 -----
 git-gui is actually maintained as an independent project, but stable
-versions are distributed as part of the Git suite for the convience
+versions are distributed as part of the Git suite for the convenience
 of end users.
 
 A git-gui development repository can be obtained from: