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/hash.h b/hash.h
index 246be9b8..d386ad03 100644
--- a/hash.h
+++ b/hash.h
@@ -35,3 +35,5 @@ public:
 };
 
 void find_hash (systemtap_session& s, const std::string& script);
+
+/* vim: set sw=2 ts=8 cino=>4,n-2,{2,^-2,t0,(0,u0,w1,M1 : */