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, 2 insertions, 0 deletions

diff --git a/mdfour.c b/mdfour.c
index a942dc9c..3c5b68cf 100644
--- a/mdfour.c
+++ b/mdfour.c
@@ -216,3 +216,5 @@ mdfour(unsigned char *out, const unsigned char *in, int n)
   mdfour_update(&md, NULL, 0);
   mdfour_result(&md, out);
 }
+
+/* vim: set sw=2 ts=8 cino=>4,n-2,{2,^-2,t0,(0,u0,w1,M1 : */