Mercurial > prosody-hg
diff core/configmanager.lua @ 6456:a8d9d3eea6f4
Merge 0.10->trunk
| author | daurnimator <quae@daurnimator.com> |
|---|---|
| date | Mon, 29 Sep 2014 13:59:16 -0400 |
| parents | a3b9496673ee |
| children | 29d5875ae38d |
| author | daurnimator <quae@daurnimator.com> |
|---|---|
| date | Mon, 29 Sep 2014 13:59:16 -0400 |
| parents | a3b9496673ee |
| children | 29d5875ae38d |