Merge branch 'master' into next

diff --git a/i3-nagbar/main.c b/i3-nagbar/main.c
index 8f28de16a815072efd590ac896b8b3ccd9798cf6..a9619f9620913c9bcc0920343adb9946199358ef 100644 (file)
--- a/i3-nagbar/main.c
+++ b/i3-nagbar/main.c
@@ -322,7 +322,7 @@ int main(int argc, char *argv[]) {
         {"font", required_argument, 0, 'f'},
         {"button", required_argument, 0, 'b'},
         {"help", no_argument, 0, 'h'},
-        {"message", no_argument, 0, 'm'},
+        {"message", required_argument, 0, 'm'},
         {"type", required_argument, 0, 't'},
         {0, 0, 0, 0}
     };