Forced merge.
[prosody.git] / prosody
2008-11-29 Tobias MarkmannForced merge.
2008-11-29 Matthew WildMake prosody executable
2008-11-29 Matthew WildAutomated merge with http://waqas.ath.cx/
2008-11-29 Matthew Wildmain.lua -> prosody