# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1241216980 -3600
# Node ID 70465a6ef75703d7b50adf944023474dd604b8b8
# Parent  84e6455be8ed67e0ca1286e2f5b49ed413505b4c# Parent  f58394b9ba668c690346fa854341b605a4a4fca1
Merge with 0.4

diff -r 84e6455be8ed -r 70465a6ef757 HACKERS
--- a/HACKERS	Thu Apr 30 03:05:56 2009 +0100
+++ b/HACKERS	Fri May 01 23:29:40 2009 +0100
@@ -1,5 +1,10 @@
 Welcome hackers!
 
-This project accepts and *encourages* contributions. If you would like to get involved you can join us on our mailing list and discussion rooms. More information on these at http://prosody.im/discuss
+This project accepts and *encourages* contributions. If you would like to get 
+involved you can join us on our mailing list and discussion rooms. More 
+information on these at http://prosody.im/discuss
 
-Patches are welcome, though before sending we would appreciate if you read docs/coding_style.txt for guidelines on how to format your code, and are comfortable with copyright of contributions being assigned to the core developers.
+Patches are welcome, though before sending we would appreciate if you read 
+docs/coding_style.txt for guidelines on how to format your code, and are 
+comfortable with copyright of contributions being assigned to the core 
+developers.
diff -r 84e6455be8ed -r 70465a6ef757 configure
--- a/configure	Thu Apr 30 03:05:56 2009 +0100
+++ b/configure	Fri May 01 23:29:40 2009 +0100
@@ -86,7 +86,7 @@
       OSTYPE="$value"
       OSTYPE_SET=yes
       ;;
-   --data-dir=*)
+   --datadir=*)
    	DATADIR="$value"
    	DATADIR_SET=yes
       ;;
diff -r 84e6455be8ed -r 70465a6ef757 core/loggingmanager.lua
--- a/core/loggingmanager.lua	Thu Apr 30 03:05:56 2009 +0100
+++ b/core/loggingmanager.lua	Fri May 01 23:29:40 2009 +0100
@@ -122,6 +122,7 @@
 
 --- Definition of built-in logging sinks ---
 
+-- Null sink, must enter log_sink_types *first*
 function log_sink_types.nowhere()
 	return function () return false; end;
 end