diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-08-10 16:32:40 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-08-10 16:32:40 +0100 |
commit | d0e22fc610946bac43ecd3789f814b22851ac9c7 (patch) | |
tree | 35fcc5411f88b421c8694d27a515ec4f9efbe63a /prosody.cfg.lua.dist | |
parent | c6fcddc61452230be89d62087e4a647bccfc34a2 (diff) | |
parent | d05d283041dacc0bd952179a93be2d274858a13b (diff) | |
download | prosody-d0e22fc610946bac43ecd3789f814b22851ac9c7.tar.gz prosody-d0e22fc610946bac43ecd3789f814b22851ac9c7.zip |
Merge 0.9->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions