Merge branch 'maint-1.6.0' into maint-1.6.1

diff --git a/.gitignore b/.gitignore
index bbaf9de0bca797508b9c2a011d0d18eac8907157..d9adce585af99e617a2906a89029a92045a79538 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -118,6 +118,7 @@ git-show
 git-show-branch
 git-show-index
 git-show-ref
+git-stage
 git-stash
 git-status
 git-stripspace