Merge branch 'maint'

diff --git a/.gitignore b/.gitignore
index 63c918c667fa005ff12ad89437f2fdc80926e21c..e0b91befb9012b8c2e9e04a4c2c5d7845b7c5e4a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -25,7 +25,6 @@ git-clone
 git-commit
 git-commit-tree
 git-config
-git-convert-objects
 git-count-objects
 git-cvsexportcommit
 git-cvsimport