Mercurial > prosody-hg
diff core/configmanager.lua @ 5249:d1baef49be21
Merge 0.9->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 16 Dec 2012 08:37:14 +0100 |
| parents | a4a74a0e9b9c |
| children | ac530c44772e |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 16 Dec 2012 08:37:14 +0100 |
| parents | a4a74a0e9b9c |
| children | ac530c44772e |