Merge branch 'maint-1.6.1' into maint

diff --git a/.gitignore b/.gitignore
index 13311f1d5e32db381cc555a97e6eb405e63d5aba..1c57d4c958bc5e8ff539c5f5ddb1c784d923271b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -82,7 +82,6 @@ git-mktag
 git-mktree
 git-name-rev
 git-mv
-git-notes
 git-pack-redundant
 git-pack-objects
 git-pack-refs