Mercurial > prosody-hg
diff core/configmanager.lua @ 5897:296e32a1ff33
Merge 0.10 -> trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 31 Oct 2013 20:49:03 +0100 |
| parents | 5cf1c08805fb |
| children | ef4024f6bc40 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 31 Oct 2013 20:49:03 +0100 |
| parents | 5cf1c08805fb |
| children | ef4024f6bc40 |