Mercurial > prosody-hg
comparison core/configmanager.lua @ 5199:e6fedce399eb
Merge 0.9->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 23 Nov 2012 01:51:53 +0100 |
| parents | a4a74a0e9b9c |
| children | ac530c44772e |
comparison
equal
deleted
inserted
replaced
| 5196:a63c4ad6cb36 | 5199:e6fedce399eb |
|---|
