Merge with trunk.

Tue, 26 Jan 2010 02:10:25 +0500

author
Waqas Hussain <waqas20@gmail.com>
date
Tue, 26 Jan 2010 02:10:25 +0500
changeset 2501
f521e89539da
parent 2500
bffdaeb7ab5e (current diff)
parent 2497
810fb77b6fe6 (diff)
child 2502
ec3eaf54bbd4

Merge with trunk.

--- a/prosodyctl	Tue Jan 26 02:07:13 2010 +0500
+++ b/prosodyctl	Tue Jan 26 02:10:25 2010 +0500
@@ -32,6 +32,8 @@
 -- Required to be able to find packages installed with luarocks
 pcall(require, "luarocks.require")
 
+require "util.dependencies"
+
 config = require "core.configmanager"
 
 do

mercurial