Software / code / prosody
Diff
core/configmanager.lua @ 5444:30ab4e69a50d
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 08 Apr 2013 15:05:16 +0100 |
| parent | 5413:0bf5e90be086 |
| child | 5776:bd0ff8ae98a8 |
| child | 5811:27ae988f5b70 |