Merge branch 'maint'

diff --git a/.gitignore b/.gitignore
index 2bcc604afea1871b2783a8768a1078572899b92f..55cd9844d61e202670076968b20dcb0fda68732e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -107,6 +107,7 @@ git-ssh-push
 git-ssh-upload
 git-status
 git-stripspace
+git-svn
 git-svnimport
 git-symbolic-ref
 git-tag
@@ -124,6 +125,7 @@ git-verify-tag
 git-whatchanged
 git-write-tree
 git-core-*/?*
+gitweb/gitweb.cgi
 test-date
 test-delta
 test-dump-cache-tree
@@ -136,4 +138,10 @@ git-core.spec
 *.[ao]
 *.py[co]
 config.mak
+autom4te.cache
+config.log
+config.status
+config.mak.autogen
+config.mak.append
+configure
 git-blame