Mercurial > prosody-hg
diff core/configmanager.lua @ 5861:c3ee62b3bdfe
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 07 Oct 2013 12:56:53 +0200 |
| parents | 5cf1c08805fb |
| children | ef4024f6bc40 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 07 Oct 2013 12:56:53 +0200 |
| parents | 5cf1c08805fb |
| children | ef4024f6bc40 |