Merge branch 'vb/sendemail' into next

diff --git a/test-date.c b/test-date.c
index 8ec41c3118417b3f2e14a84978748ee52b7edd9b..93e802759f1906665857c82c71f589b7d636b540 100644 (file)
--- a/test-date.c
+++ b/test-date.c
@@ -14,7 +14,10 @@ int main(int argc, char **argv)
                memcpy(result, "bad", 4);
                parse_date(argv[i], result, sizeof(result));
                t = strtoul(result, NULL, 0);
-               printf("%s -> %s -> %s\n", argv[i], result, ctime(&t));
+               printf("%s -> %s -> %s", argv[i], result, ctime(&t));
+
+               t = approxidate(argv[i]);
+               printf("%s -> %s\n", argv[i], ctime(&t));
        }
        return 0;
 }