Merge branch 'master' into next

diff --git a/mailsplit.c b/mailsplit.c
index 14c1358734c5434ed5611f77f67ee31ff8cdb0d2..c529e2d060b610d8f0dd80464634a954c4d058e8 100644 (file)
--- a/mailsplit.c
+++ b/mailsplit.c
@@ -11,7 +11,6 @@
 #include <sys/stat.h>
 #include <string.h>
 #include <stdio.h>
-#include <assert.h>
 #include "cache.h"
 
 static const char git_mailsplit_usage[] =