# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1266412962 0
# Node ID bb9b4cb30c567485192e51eeba2798b2ac3b53f0
# Parent  42a6e4d09b09a3c8a06a3ae987c9d5b41c3b0a67# Parent  9fab590093979cb1c2e725a7c656e63346c4ea1e
Merge with 0.7

diff -r 9fab59009397 -r bb9b4cb30c56 prosody
--- a/prosody	Wed Feb 17 13:21:33 2010 +0000
+++ b/prosody	Wed Feb 17 13:22:42 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