Automated merge with http://waqas.ath.cx/
[prosody.git] / COPYING
2008-12-03 Matthew WildMerge from waqas
2008-12-03 Matthew WildFix license (left some boilerplate in)
2008-11-29 Tobias MarkmannAutomated merge.
2008-11-29 Matthew WildAdd COPYING, remove LICENSE