diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-03-18 01:16:39 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-03-18 01:16:39 +0000 |
commit | 4528953bcd7937bdd9d46c9cd07b6c0cbae94244 (patch) | |
tree | f011981c3a1c4e5791ad53acb67c1545c6bdef7d /prosody.cfg.lua.dist | |
parent | fb803e14088f1fae972d0f6d15d051b5a375be6e (diff) | |
parent | 2980a625eab621f842456e06f660528f6fd61523 (diff) | |
download | prosody-4528953bcd7937bdd9d46c9cd07b6c0cbae94244.tar.gz prosody-4528953bcd7937bdd9d46c9cd07b6c0cbae94244.zip |
Merge 0.6 with waqas
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions