Merge branch 'maint'

diff --git a/.gitignore b/.gitignore
index 6e973b3d4bd107fb77df6b9394b87a7b79d96e0e..55cd9844d61e202670076968b20dcb0fda68732e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -125,6 +125,7 @@ git-verify-tag
 git-whatchanged
 git-write-tree
 git-core-*/?*
+gitweb/gitweb.cgi
 test-date
 test-delta
 test-dump-cache-tree