# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1266550275 0
# Node ID 467568f1117db90381732e6953467378e07a87ca
# Parent  35f36a53c6710777ba733e84ed16ce14dcd4d158# Parent  4516888fc42d1a550fcee79ba9d89ed146e4029a
Merge with 0.7

diff -r 4516888fc42d -r 467568f1117d prosody
--- a/prosody	Fri Feb 19 03:30:27 2010 +0000
+++ b/prosody	Fri Feb 19 03:31:15 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