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

diff --git a/util.cxx b/util.cxx
index 42f0beb5..7d191cd2 100644
--- a/util.cxx
+++ b/util.cxx
@@ -248,3 +248,4 @@ const string cmdstr_quoted(const string& cmd)
 	return quoted_cmd;
 }
 
+/* vim: set sw=2 ts=8 cino=>4,n-2,{2,^-2,t0,(0,u0,w1,M1 : */