Merge branch 'maint'

diff --git a/.gitignore b/.gitignore
index 249b451b87cfddc98e9c32f94c7d14ba91c7e1ad..c8c13f550317e12ccb5d3515fbc942463c8be4e0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -128,7 +128,6 @@ git-status
 git-stripspace
 git-submodule
 git-svn
-git-svnimport
 git-symbolic-ref
 git-tag
 git-tar-tree