aboutsummaryrefslogtreecommitdiffstats
path: root/core/configmanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-07-08 18:49:44 +0100
committerMatthew Wild <mwild1@gmail.com>2012-07-08 18:49:44 +0100
commitbd050e2b64086b818592f81606b52db8bb01309e (patch)
tree1b780be536dea23b0e32d06cee9eeef6bc0ec5a1 /core/configmanager.lua
parent28df9086d844e7a8ca6f26b55fe6297e044e7be7 (diff)
parentf305f2082762ad627aaf018132d81382a5206cbd (diff)
downloadprosody-bd050e2b64086b818592f81606b52db8bb01309e.tar.gz
prosody-bd050e2b64086b818592f81606b52db8bb01309e.zip
Merge 0.9->trunk
Diffstat (limited to 'core/configmanager.lua')
0 files changed, 0 insertions, 0 deletions