Merge branch 'master' into wip-bbb

Conflicts:
	gnuplot.py

1 files changed, 1 insertions, 0 deletions

diff --git a/wsched.py b/wsched.py
index 8214bf0..4aa2f74 100755
--- a/wsched.py
+++ b/wsched.py
@@ -83,6 +83,7 @@ options = [
     o(None, '--no-comments', action='store_true', dest='no_comments'),
     o('-w', '--col-width', action='store', type='int', dest='colwidth'),
     o(None, '--split', action='store_true', dest='want_split'),
+    o('-f', '--key-format', action='store', dest='key_fmt'),
     ]
 
 defaults = {