aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2010-01-26 02:10:25 +0500
committerWaqas Hussain <waqas20@gmail.com>2010-01-26 02:10:25 +0500
commit7618211cd6802f8cd3d1b57c27b64a5933994a4a (patch)
tree05b2a68661ea59b9de99cb98e1004a2c613c6c46
parent0808c70c4ec33ed7e48402b45ef820c61d1d3659 (diff)
parent2cbebc7d4296a9042f6fba0360aa5846c1104181 (diff)
downloadprosody-7618211cd6802f8cd3d1b57c27b64a5933994a4a.tar.gz
prosody-7618211cd6802f8cd3d1b57c27b64a5933994a4a.zip
Merge with trunk.
-rwxr-xr-xprosodyctl2
1 files changed, 2 insertions, 0 deletions
diff --git a/prosodyctl b/prosodyctl
index 1c82d458..9f51cb68 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -32,6 +32,8 @@ end
-- Required to be able to find packages installed with luarocks
pcall(require, "luarocks.require")
+require "util.dependencies"
+
config = require "core.configmanager"
do