Merge branch 'master' into work

Conflicts:

	ChangeLog

1 files changed, 1 insertions, 0 deletions

diff --git a/session.h b/session.h
index b06d9ecc..d8f3e38a 100644
--- a/session.h
+++ b/session.h
@@ -88,6 +88,7 @@ struct systemtap_session
   bool timing;
   bool keep_tmpdir;
   bool guru_mode;
+  bool listing_mode;
   bool bulk_mode;
   bool unoptimized;
   bool merge;