Merge branch 'maint'

diff --git a/.gitignore b/.gitignore
index 87b833c9d8940a61ff77ec6bd35241b3f85decb5..3dd6ef7d259d8fe2811f68525b5309e97c79f4cc 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -177,6 +177,7 @@
 /test-sha1
 /test-sigchain
 /test-string-pool
+/test-subprocess
 /test-svn-fe
 /test-treap
 /common-cmds.h