# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1266340572 0
# Node ID 42a6e4d09b09a3c8a06a3ae987c9d5b41c3b0a67
# Parent  7491cef7b5c566efe45f92d723f2fc02950f6915# Parent  07a6f5f9d4beba8efd957377f8b182a4f5c5cfcd
Merge with 0.7

diff -r 07a6f5f9d4be -r 42a6e4d09b09 prosody
--- a/prosody	Tue Feb 16 17:15:43 2010 +0000
+++ b/prosody	Tue Feb 16 17:16:12 2010 +0000
@@ -22,9 +22,6 @@
 	package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath;
 end
 
-package.path = package.path..";"..(CFG_SOURCEDIR or ".").."/fallbacks/?.lua";
-package.cpath = package.cpath..";"..(CFG_SOURCEDIR or ".").."/fallbacks/?.so";
-
 -- Substitute ~ with path to home directory in data path
 if CFG_DATADIR then
 	if os.getenv("HOME") then