Merge from waqas
[prosody.git] / core / discomanager.lua
2008-11-23 Matthew WildMerge from waqas
2008-11-23 Waqas HussainAhem, a bit of an identity crisis..
2008-11-23 Matthew WildMerge from waqas
2008-11-22 Waqas HussainAdded discomanager