Software / code / prosody
Diff
core/configmanager.lua @ 2985:fde53d82fde0
Merge 0.7->trunk (with MUC needing checking, waqas)
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 04 May 2010 23:36:50 +0100 |
| parent | 2975:c1a2e210f47e |
| parent | 2984:3094166cfdd5 |
| child | 3012:6d86e26f0923 |
