Mercurial > prosody-hg
comparison core/configmanager.lua @ 5273:746f07d280e2
Merge 0.9->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 28 Dec 2012 03:03:56 +0100 |
| parents | a4a74a0e9b9c |
| children | ac530c44772e |
comparison
equal
deleted
inserted
replaced
| 5271:f716a3c58b4b | 5273:746f07d280e2 |
|---|
