# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1266548340 0
# Node ID 35f36a53c6710777ba733e84ed16ce14dcd4d158
# Parent  4ddacf58f43d4164e595feb241748c70e32b5d01# Parent  9dbe9acf82e8da6d52532529def3ea28ebb879e1
Merge with 0.7

diff -r 9dbe9acf82e8 -r 35f36a53c671 prosody
--- a/prosody	Fri Feb 19 02:58:34 2010 +0000
+++ b/prosody	Fri Feb 19 02:59:00 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