diff options
author | Matthew Wild <mwild1@gmail.com> | 2011-06-02 15:28:41 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2011-06-02 15:28:41 +0100 |
commit | a5f20c7ca1e58165e1e0e66fbf051d610b467753 (patch) | |
tree | f1f7e71f8e6c2be0ce3b8d49bf4d06f0b92b4f18 /prosody.cfg.lua.dist | |
parent | 3415a3da2add388452f19386d7b37bffec49a2a7 (diff) | |
parent | 0193bc555b8c9c4751311967e7ec951641818c65 (diff) | |
download | prosody-a5f20c7ca1e58165e1e0e66fbf051d610b467753.tar.gz prosody-a5f20c7ca1e58165e1e0e66fbf051d610b467753.zip |
Merge 0.8->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions