Merge branch 'maint'

diff --git a/t/.gitignore b/t/.gitignore
index 11ffd910c1b5022e0bd3aa217147269c8e9ac29e..4e731dc1e3bef53903f030ee7c63fe7ef7324cb1 100644 (file)
--- a/t/.gitignore
+++ b/t/.gitignore
@@ -1 +1,3 @@
-/trash directory
+/trash directory*
+/test-results
+/.prove