Sync with v2.5.4

diff --git a/.gitignore b/.gitignore
index a685ec1fb0ca49607431a65f1ccf035bb9b95a3a..4fd81baf856669fb984a5a0b82a1115e840fc16d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -205,6 +205,7 @@
 /test-sha1-array
 /test-sigchain
 /test-string-list
+/test-submodule-config
 /test-subprocess
 /test-svn-fe
 /test-urlmatch-normalization