Merge branch 'master' into pr6866

Conflicts:
	ChangeLog: Removed
	runtime/ChangeLog: Removed
	runtime/sym.c: Merged
	runtime/task_finder.c: Merged
	tapset/ChangeLog: Removed
	testsuite/ChangeLog: Removed

1 files changed, 1 insertions, 3 deletions

diff --git a/mdfour.h b/mdfour.h
index 5ed9df30..cac1fe24 100644
--- a/mdfour.h
+++ b/mdfour.h
@@ -34,6 +34,4 @@ void mdfour_update(struct mdfour *md, const unsigned char *in, int n);
 void mdfour_result(struct mdfour *md, unsigned char *out);
 void mdfour(unsigned char *out, const unsigned char *in, int n);
 
-
-
-
+/* vim: set sw=2 ts=8 cino=>4,n-2,{2,^-2,t0,(0,u0,w1,M1 : */