# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1266519650 0
# Node ID 4ddacf58f43d4164e595feb241748c70e32b5d01
# Parent  ef33efdec5bb15070dcda2553bc748d25fd2960e# Parent  82f3820758ede5b0fdbf331d0dbb5b35d624bb08
Merge with 0.7

diff -r 82f3820758ed -r 4ddacf58f43d prosody
--- a/prosody	Thu Feb 18 14:28:52 2010 +0500
+++ b/prosody	Thu Feb 18 19:00:50 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