Merge 0.11->trunk

1 files changed, 1 insertions, 5 deletions

diff --git a/prosody b/prosody
index e82318d1..87f24291 100755
--- a/prosody
+++ b/prosody
@@ -43,11 +43,7 @@ if CFG_DATADIR then
 	end
 end
 
-if #arg > 0 and arg[1] ~= "--config" then
-	print("Unknown command-line option: "..tostring(arg[1]));
-	print("Perhaps you meant to use prosodyctl instead?");
-	return 1;
-end
+
 
 local startup = require "util.startup";
 local async = require "util.async";