Automated merge with http://waqas.ath.cx/

Fix for handling latin1 encoded hostnames in SASL

Fix GPL'ing MIT/X licensed code :)

Update HACKERS

Fill blank with URL

Remove stray merge marker

Merge from waqas

config and data directories taken from path, and quoted to allow spaces in path

Converted prosody.cfg.lua.dist to use windows end-of-lines

Fix license (left some boilerplate in)

and the C files too

Insert copyright/license headers

Fix port number in mod_console instructions

lxmppd -> Prosody

Fix macosx ostype target

(0) -300 -100 -15 +15 +100 +300 +1000 +3000 tip

mercurial