Merge branch 'maint'

diff --git a/t/t5100-mailinfo.sh b/t/t5100-mailinfo.sh
index 60df10f46a52ea4ea33eded268beddc13fec29ea..e97cfb2ab838fc9d9ecf1a7d207d6316e11a63f5 100755 (executable)
--- a/t/t5100-mailinfo.sh
+++ b/t/t5100-mailinfo.sh
@@ -34,7 +34,7 @@ do
                if test -f "$TEST_DIRECTORY"/t5100/msg$mail--no-inbody-headers
                then
                        check_mailinfo $mail --no-inbody-headers
-               fi
+               fi &&
                if test -f "$TEST_DIRECTORY"/t5100/msg$mail--message-id
                then
                        check_mailinfo $mail --message-id